Changeset a7eaa89


Ignore:
Timestamp:
08/24/2013 01:12:18 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
2a33982
Parents:
779ed51
Message:

revert some parts of previous two commits

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11682 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
1 added
3 edited
3 moved

Legend:

Unmodified
Added
Removed

  • multimedia/hwaccel/libva.xml

    r779ed51 ra7eaa89  
    2222]>
    2323
    24 <sect2 id="libva" xreflabel="libva-&libva-version;">
    25 
    26   <sect2info>
     24<sect1 id="libva" xreflabel="libva-&libva-version;">
     25  <?dbhtml filename="libva.html"?>
     26
     27  <sect1info>
    2728    <othername>$LastChangedBy$</othername>
    2829    <date>$Date$</date>
    29   </sect2info>
     30  </sect1info>
    3031
    3132  <title>libva-&libva-version;</title>
    … …  
    3536  </indexterm>
    3637
    37   <sect3 role="package">
     38  <sect2 role="package">
    3839    <title>Introduction to libva</title>
    3940
    40     <para>
    41        The <application>libva</application> package contains a library which
    42        provides access to hardware accelerated video processing, using hardware
    43        to accelerate video processing in order to offload the central
    44        processing unit (CPU) to decode and encode compressed digital video.  VA
    45        API video decode/encode interface is platform and window system
    46        independent targeted at Direct Rendering Infrastructure (DRI) in the X
    47        Window System however it can potentially also be used with direct
    48        framebuffer and graphics sub-systems for video output. Accelerated
    49        processing includes support for video decoding, video encoding,
    50        subpicture blending, and rendering.
    51     </para>
    52 
    53     &lfs74_checked;
    54 
    55     <bridgehead renderas="sect4">Package Information</bridgehead>
     41    <para>
     42      The <application>libva</application> package contains a library which
     43      provides access to hardware accelerated video processing, using hardware
     44      to accelerate video processing in order to offload the central processing
     45      unit (CPU) to decode and encode compressed digital video.
     46    </para>
     47
     48    &lfs73_checked;
     49
     50    <bridgehead renderas="sect3">Package Information</bridgehead>
    5651    <itemizedlist spacing="compact">
    5752      <listitem>
    … …  
    8782    </itemizedlist>
    8883
    89     <bridgehead renderas="sect4">Additional Downloads</bridgehead>
     84    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    9085    <itemizedlist spacing="compact">
    9186      <listitem>
    … …  
    121116    </itemizedlist>
    122117
    123     <bridgehead renderas="sect4">libva Dependencies</bridgehead>
    124 
    125     <bridgehead renderas="sect5">Required</bridgehead>
     118    <bridgehead renderas="sect3">libva Dependencies</bridgehead>
     119
     120    <bridgehead renderas="sect4">Required</bridgehead>
    126121    <para role="required">
    127122      <xref linkend="mesalib"/>
    128123    </para>
    129124
    130     <bridgehead renderas="sect5">Optional</bridgehead>
     125    <bridgehead renderas="sect4">Optional</bridgehead>
    131126    <para role="optional">
    132127      <xref linkend="doxygen"/> and
    … …  
    137132      User Notes: <ulink url="&blfs-wiki;/libva"/>
    138133    </para>
    139   </sect3>
    140 
    141   <sect3 role="installation">
     134  </sect2>
     135
     136  <sect2 role="installation">
    142137    <title>Installation of libva</title>
    143138
    … …  
    147142    </para>
    148143
    149 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
     144<screen><userinput>./configure --prefix=/usr &amp;&amp;
    150145make</userinput></screen>
    151146
    … …  
    160155<screen role="root"><userinput>make install</userinput></screen>
    161156
    162   </sect3>
    163 
    164   <sect3 role="installation">
     157  </sect2>
     158
     159  <sect2 role="installation">
    165160    <title>Installation of libva-intel-driver</title>
    166161
    167162    <para>
    168       The <application>libva-intel-driver</application> is designed
    169       specifically for video cards based on an Intel GPU. 
    170       Install the driver by running the following commands:
    171     </para>
    172 
    173 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
     163      Install <application>libva-intel-driver</application> by running the
     164      following commands:
     165    </para>
     166
     167<screen><userinput>./configure --prefix=/usr &amp;&amp;
    174168make</userinput></screen>
    175169
    … …  
    184178<screen role="root"><userinput>make install</userinput></screen>
    185179
    186   </sect3>
    187 
    188   <sect3 role="content">
     180  </sect2>
     181
     182  <sect2 role="content">
    189183    <title>Contents</title>
    190184
    … …  
    233227    </variablelist>
    234228
    235   </sect3>
    236 
    237 </sect2>
     229  </sect2>
     230
     231</sect1>

  • multimedia/hwaccel/libvdpau.xml

    r779ed51 ra7eaa89  
    1313]>
    1414
    15 <sect2 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
     15<sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
     16  <?dbhtml filename="libvdpau.html"?>
    1617
    17   <sect2info>
     18  <sect1info>
    1819    <othername>$LastChangedBy$</othername>
    1920    <date>$Date$</date>
    20   </sect2info>
     21  </sect1info>
    2122
    2223  <title>libvdpau-&libvdpau-version;</title>
    … …  
    2627  </indexterm>
    2728
    28   <sect3 role="package">
     29  <sect2 role="package">
    2930    <title>Introduction to libvdpau</title>
    3031
    3132    <para>
    3233      The <application>libvdpau</application> package contains a library which
    33       implements the VDPAU library.
    34     </para>
    35      
    36     <para>
    37       VDPAU (Video Decode and Presentation API for Unix) is an open source
    38       library (libvdpau) and API originally designed by Nvidia for its GeForce
    39       8 series and later GPU hardware,[1][2] targeted at the X Window System
    40       This VDPAU API allows video programs to offload portions of the video
    41       decoding process and video post-processing to the GPU video-hardware.
    42    </para>
    43 
    44    <para>
    45       Currently, the portions capable of being offloaded by VDPAU onto the GPU
    46       are motion compensation (mo comp), inverse discrete cosine transform
    47       (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
    48       MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
    49       videos.  Which specific codecs of these that can be offloaded to the
    50       GPU depends on the version of the GPU hardware; specifically,
    51       to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
    52       DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
    53       Nvidia's GeForce graphics processing units) or newer GPU hardware is
    54       required.
     34      allows video programs to offload portions of the video decoding process
     35      and video post-processing to the GPU video-hardware.
    5536    </para>
    5637
    57     &lfs74_checked;
     38    &lfs73_checked;
    5839
    59     <bridgehead renderas="sect4">Package Information</bridgehead>
     40    <bridgehead renderas="sect3">Package Information</bridgehead>
    6041    <itemizedlist spacing="compact">
    6142      <listitem>
    … …  
    9172    </itemizedlist>
    9273
    93     <bridgehead renderas="sect4">libvdpau Dependencies</bridgehead>
     74    <bridgehead renderas="sect3">libvdpau Dependencies</bridgehead>
    9475
    95     <bridgehead renderas="sect5">Required</bridgehead>
     76    <bridgehead renderas="sect4">Required</bridgehead>
    9677    <para role="required">
    9778      <xref linkend="xorg7-lib"/>
    9879    </para>
    9980
    100     <bridgehead renderas="sect5">Optional</bridgehead>
     81    <bridgehead renderas="sect4">Optional</bridgehead>
    10182    <para role="optional">
    10283      <xref linkend="doxygen"/>,
    … …  
    10586    </para>
    10687
    107     <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
     88    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
    10889    <para role="optional">
    10990      <xref linkend="mesalib"/>
    … …  
    11394      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
    11495    </para>
    115   </sect3>
     96  </sect2>
    11697
    117   <sect3 role="installation">
     98  <sect2 role="installation">
    11899    <title>Installation of libvdpau</title>
    119100
    … …  
    123104    </para>
    124105
    125 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
     106<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
    126107make</userinput></screen>
    127108
    … …  
    136117<screen role="root"><userinput>make install</userinput></screen>
    137118
    138   </sect3>
     119  </sect2>
    139120
    140   <sect3 role="content">
     121  <sect2 role="content">
    141122    <title>Contents</title>
    142123
    … …  
    180161    </variablelist>
    181162
    182   </sect3>
     163  </sect2>
    183164
    184 </sect2>
     165</sect1>

  • multimedia/multimedia.xml

    r779ed51 ra7eaa89  
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdriv/libdriv.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hwaccel/hwaccel.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audioutils/audioutils.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="videoutils/videoutils.xml"/>

  • x/installing/x7driver.xml

    r779ed51 ra7eaa89  
    161161    </sect3>
    162162
    163     <sect3 id="hw-video-acceleration">
    164       <title>Hardware Video Acceleration</title>
    165 
    166       <itemizedlist spacing="compact">
    167         <listitem>
    168           <para>
    169             <xref linkend="libva"/>
    170           </para>
    171         </listitem>
    172         <listitem>
    173           <para>
    174             <xref linkend="libvdpau"/>
    175           </para>
    176         </listitem>
    177       </itemizedlist>
    178 
    179     </sect3>
    180 
    181163  </sect2>
    182164
    … …  
    238220    href="x7driver-vmware.xml"/>
    239221
    240   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    241     href="libva.xml"/>
    242 
    243   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    244     href="libvdpau.xml"/>
    245 
    246222</sect1>

  • x/lib/qt4.xml

    r779ed51 ra7eaa89  
    4040    </para>
    4141
    42     &lfs74_checked;
     42    &lfs73_checked;
    4343
    4444    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8080    <bridgehead renderas="sect4">Required</bridgehead>
    8181    <para role="required">
    82       <xref linkend="alsa-lib"/> and
    83       <xref linkend="mesalib"/>
     82      <xref linkend="alsa-lib"/>,
     83      <xref linkend="mesalib"/> and
     84      <xref linkend="qtchooser"/>
    8485    </para>
    8586
    … …  
    9495      <xref linkend="libpng"/>,
    9596      <xref linkend="libtiff"/>,
    96       <xref linkend="openssl"/>, and
     97      <xref linkend="openssl"/> and
    9798      <xref linkend="sqlite"/>
    9899    </para>
    … …  
    105106      <xref linkend="mysql"/>,
    106107      <xref linkend="postgresql"/>,
    107       <xref linkend="pulseaudio"/>,
    108       <xref linkend="qtchooser"/> (if also installing Qt5), and
     108      <xref linkend="pulseaudio"/> and
    109109      <xref linkend="unixodbc"/>
    110110    </para>
    … …  
    118118    <title>Installation of Qt</title>
    119119
    120     <para>
    121 
    122        There are several ways to install a complicated package such as
    123        <application>Qt</application>. The files are not completely position
    124        independent. Installation procedures execute the program
    125        <command>pkg-config</command> to determine the location of package
    126        executables, libraries, headers, and other files. For
    127        <application>Qt</application>, <command>pkg-config</command> will look
    128        for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files
    129        which must be modified if relocating the package. These files are set up
    130        correctly by the build process.
    131     </para>
    132    
    133     <para>
    134        The default installation places the files in <filename
    135        class='directory'>/usr/local/qt/</filename>. Many commercial
    136        distributions place the files in the system's <filename
    137        class='directory'>/usr</filename> hierarchy. The package can also be
    138        installed in an arbitrary directory.
    139     </para>
    140    
    141     <para>
    142        The advantage of installing in <filename
    143        class='directory'>/usr</filename> is that no updates to the
    144        <filename>/etc/ld.so.conf</filename> or
    145        <filename>/etc/man_db.conf</filename> files are required. The package
    146        files are distributed within several subdirectories of the <filename
    147        class='directory'>/usr</filename> hierarchy.  This is the method that
    148        most commercial distributions use.  It is also supported by the
    149        optional <application>qtchooser</application> application.
    150     </para>
    151 
    152     <para>
    153        The advantage of installing <application>Qt4</application> in a custom
    154        directory such as <filename
    155        class='directory'>/opt/qt-&qt4-version;</filename> is that it keeps all
    156        the package files consolidated in a dedicated directory hierarchy. By
    157        using this method, an update can be made without overwriting a previous
    158        installation and users can easily revert to a previous version by
    159        changing one symbolic link or merely changing the PATH variable.  It
    160        also allows a developer to maintain multiple versions of
    161        <application>Qt4</application> for testing.
    162     </para>
    163 
    164     <warning>
     120   <warning>
    165121      <para>
    166122        If you did not install some of the recommended dependencies, examine
    … …  
    172128    <caution>
    173129      <para>
    174         If <application>Qt</application> is being reinstalled into the
    175         same directory as an existing instance, run the
     130        If <application>Qt</application> is being reinstalled, run the
    176131        following commands from a console or non-Qt based window manager.
    177132        It overwrites <application>Qt</application> libraries that should
    … …  
    189144    </note>
    190145
    191     <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
    192 
    193146    <para>
    194147      Install <application>Qt</application> by running the
    … …  
    199152     config.tests/unix/libmng/libmng.cpp &amp;&amp;
    200153
    201 ./configure -prefix         /usr                 \
    202             -bindir         /usr/lib/qt4/bin     \
    203             -plugindir      /usr/lib/qt4/plugins \
    204             -importdir      /usr/lib/qt4/imports \
    205             -headerdir      /usr/include/qt4     \
    206             -datadir        /usr/share/qt4       \
    207             -sysconfdir     /etc/xdg             \
    208             -docdir         /usr/share/doc/qt4   \
    209             -demosdir       /usr/share/doc/qt4/demos    \
    210             -examplesdir    /usr/share/doc/qt4/examples \
     154./configure -confirm-license \
     155            -opensource \
     156            -release \
     157            -prefix /usr \
     158            -bindir /usr/lib/qt4/bin \
     159            -headerdir /usr/include/qt4 \
     160            -datadir /usr/share/qt4 \
     161            -plugindir /usr/lib/qt4/plugins \
     162            -importdir /usr/lib/qt4/imports \
    211163            -translationdir /usr/share/qt4/translations \
    212             -confirm-license   \
    213             -opensource        \
    214             -release           \
    215             -dbus-linked       \
    216             -openssl-linked    \
    217             -system-sqlite     \
    218             -no-phonon         \
     164            -sysconfdir /etc/xdg \
     165            -docdir /usr/share/doc/qt4 \
     166            -demosdir /usr/share/doc/qt4/demos \
     167            -examplesdir /usr/share/doc/qt4/examples \
     168            -dbus-linked \
     169            -openssl-linked \
     170            -system-sqlite \
     171            -no-phonon \
    219172            -no-phonon-backend \
    220             -no-nis            \
    221             -no-openvg         \
    222             -nomake demos      \
    223             -nomake examples   \
    224             -optimized-qmake   &amp;&amp;
    225 
     173            -no-nis \
     174            -no-openvg \
     175            -nomake demos \
     176            -nomake examples \
     177            -optimized-qmake &amp;&amp;
    226178make</userinput></screen>
    227179
    … …  
    237189rm -rf /usr/tests &amp;&amp;
    238190install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
    239                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
     191                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
    240192install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
    241193                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
    242194install -v -Dm644 tools/designer/src/designer/images/designer.png \
    243                   /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
     195                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
    244196install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
    245                   /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
     197                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
    246198install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    247199                  /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
    … …  
    275227done</userinput></screen>
    276228
    277     <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead>
    278 
    279     <para>
    280       Install <application>Qt</application> in  /opt/qt-&qt4-version;
    281       by running the following commands:
    282     </para>
    283 
    284 <screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    285      config.tests/unix/libmng/libmng.cpp &amp;&amp;
    286 
    287 export QTDIR=/opt/qt-&qt4-version;
    288 
    289 ./configure -prefix $QTDIR       \
    290             -sysconfdir /etc/xdg \
    291             -confirm-license     \
    292             -opensource          \
    293             -release             \
    294             -dbus-linked         \
    295             -openssl-linked      \
    296             -system-sqlite       \
    297             -plugin-sql-sqlite   \
    298             -no-phonon           \
    299             -no-phonon-backend   \
    300             -no-nis              \
    301             -no-openvg           \
    302             -nomake demos        \
    303             -nomake examples     \
    304             -optimized-qmake     &amp;&amp;
    305 
    306 make</userinput></screen>
    307 
    308     <para>
    309       Now, as the <systemitem class="username">root</systemitem> user:
    310     </para>
    311 
    312 <screen role="root"><userinput>make install                 &amp;&amp;
    313 ln -svfn qt-$VERSION /opt/qt &amp;&amp;
    314 
    315 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
    316                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
    317 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
    318                   /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
    319 install -v -Dm644 tools/designer/src/designer/images/designer.png \
    320                   /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
    321 install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
    322                   /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
    323 install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    324                   /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
    325 
    326     <para>
    327       Remove references to the build directory from installed files by
    328       running the following command as the
    329       <systemitem class="username">root</systemitem> user:
    330     </para>
    331 
    332 <screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
    333             Designer Gui Help Multimedia Network OpenGL Script \
    334             ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml; do
    335   sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
    336        $QTDIR/lib/libQt${file}.prl
    337   perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/Qt${file}.pc
    338 done
    339 
    340 unset file</userinput></screen>
    341 
    342229  </sect2>
    343230
    … …  
    418305
    419306      <para>
    420         If you installed <application>Qt</application> in /usr,
    421         create an environment variable needed by certain packages.
     307        Create an environment variable needed by certain packages.
    422308        As the <systemitem class="username">root</systemitem> user:
    423309      </para>
    … …  
    433319EOF</userinput></screen>
    434320
    435    <para>
    436       If you installed <application>Qt</application> in a location other
    437       than /usr, you need to update the following configuration files so
    438       that <application>Qt</application> is correctly found by other packages
    439       and system processes.</para>
    440    
    441       <para>As the <systemitem class="username">root</systemitem> user, update
    442       the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
    443       run-time cache file:
    444    </para>
    445    
    446 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
    447    <literal># Begin Qt addition
    448    
    449 /opt/qt/lib
    450    
    451 # End Qt addition</literal>
    452 EOF
    453 
    454 ldconfig</userinput></screen>
    455    
    456    <indexterm zone="qt4 qtconfig-qt4">
    457       <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
    458    </indexterm>
    459    
    460    <para>
    461       As the <systemitem class="username">root</systemitem> user, create
    462       the <filename>/etc/profile.d/qt.sh</filename> file:
    463    </para>
    464    
    465 <screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
    466    <literal># Begin /etc/profile.d/qt.sh
    467    
    468 QTDIR=/opt/qt
    469    
    470 pathappend /opt/qt/bin           PATH
    471 pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
    472    
    473 export QTDIR
    474    
    475 # End /etc/profile.d/qt.sh</literal>
    476 EOF</userinput></screen>
    477 
    478321      <para>
    479         For all methods, Create the menu entries for installed applications.
     322        Create the menu entries for installed applications.
    480323        As the <systemitem class="username">root</systemitem> user:
    481324      </para>
    482325
    483326<screen role="root"><userinput>install -dm755 /usr/share/applications
    484 
    485327cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; "EOF"
    486328<literal>[Desktop Entry]
    … …  
    494336Categories=Qt;Settings;</literal>
    495337EOF
    496 
    497338cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; "EOF"
    498339<literal>[Desktop Entry]
    … …  
    506347Categories=Qt;Development;Documentation;</literal>
    507348EOF
    508 
    509349cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; "EOF"
    510350<literal>[Desktop Entry]
    … …  
    519359Categories=Qt;Development;</literal>
    520360EOF
    521 
    522361cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; "EOF"
    523362<literal>[Desktop Entry]
    … …  
    532371Categories=Qt;Development;</literal>
    533372EOF
    534 
    535373cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; "EOF"
    536374<literal>[Desktop Entry]
    … …  
    579417          /usr/include/qt4,
    580418          /usr/lib/qt4,
    581           /usr/share/doc/qt4, and
    582           /usr/share/qt4 (OR $QTDIR)
     419          /usr/share/doc/qt4 and
     420          /usr/share/qt4
    583421        </seg>
    584422      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.