Author: rthomsen
Date: 2012-07-14 04:38:15 -0600 (Sat, 14 Jul 2012)
New Revision: 10413
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genutils/desktop-file-utils.xml
trunk/BOOK/general/prog/subversion.xml
trunk/BOOK/gnome/deprecated/libgnomeui.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde4/add/add-pkgs.xml
trunk/BOOK/kde4/add/ark.xml
trunk/BOOK/kde4/add/gwenview.xml
trunk/BOOK/kde4/add/kate.xml
trunk/BOOK/kde4/add/kcalc.xml
trunk/BOOK/kde4/add/kde4admin.xml
trunk/BOOK/kde4/add/kde4artwork.xml
trunk/BOOK/kde4/add/kde4multimedia.xml
trunk/BOOK/kde4/add/kde4network.xml
trunk/BOOK/kde4/add/kde4pim.xml
trunk/BOOK/kde4/add/kde4pimruntime.xml
trunk/BOOK/kde4/add/kde4plasmaaddons.xml
trunk/BOOK/kde4/add/konsole.xml
trunk/BOOK/kde4/add/libkexiv2.xml
trunk/BOOK/kde4/add/okular.xml
trunk/BOOK/kde4/core/config.xml
trunk/BOOK/kde4/core/kactivities.xml
trunk/BOOK/kde4/core/kde4baseapps.xml
trunk/BOOK/kde4/core/kde4libs.xml
trunk/BOOK/kde4/core/kde4pimlibs.xml
trunk/BOOK/kde4/core/kde4runtime.xml
trunk/BOOK/kde4/core/kde4workspace.xml
trunk/BOOK/kde4/core/oxygen-icons.xml
trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml
trunk/BOOK/kde4/core/phonon-backend-vlc.xml
trunk/BOOK/kde4/core/polkit-qt.xml
trunk/BOOK/kde4/core/qimageblitz.xml
trunk/BOOK/kde4/intro/pre-install-config.xml
trunk/BOOK/multimedia/audioutils/amarok.xml
trunk/BOOK/multimedia/cdwriteutils/k3b.xml
trunk/BOOK/server/other/virtuoso.xml
Log:
Phonon-backen-gstreamer 4.6.1. Several KDE infrastructure changes.
Modified: trunk/BOOK/general/genutils/desktop-file-utils.xml
===================================================================
--- trunk/BOOK/general/genutils/desktop-file-utils.xml 2012-07-12 19:08:27 UTC
(rev 10412)
+++ trunk/BOOK/general/genutils/desktop-file-utils.xml 2012-07-14 10:38:15 UTC
(rev 10413)
@@ -130,7 +130,7 @@
<para>For <application>KDE</application>:</para>
-<screen><literal>XDG_DATA_DIRS=$KDE_PREFIX/share:/usr/local/share:/usr/share
+<screen><literal>XDG_DATA_DIRS=&kde-dir;/share:/usr/local/share:/usr/share
XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
@@ -144,7 +144,7 @@
<para>If you're installing both <application>GNOME</application> and
<application>KDE</application>:</para>
-<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:$KDE_PREFIX/share
+<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:&kde-dir;/share
export XDG_DATA_DIRS</literal></screen>
-->
Modified: trunk/BOOK/general/prog/subversion.xml
===================================================================
--- trunk/BOOK/general/prog/subversion.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/general/prog/subversion.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -102,7 +102,7 @@
<xref linkend="openssl"/>,
<xref linkend="dbus-glib"/>,
<xref linkend="gnome-keyring"/>,
- KWallet from KDE4 and
+ KWallet from KDE and
<xref linkend="apache"/>.
</para>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/general.ent 2012-07-14 10:38:15 UTC (rev 10413)
@@ -3,13 +3,13 @@
$Date$
-->
-<!ENTITY day "12"> <!-- Always 2 digits -->
+<!ENTITY day "14"> <!-- Always 2 digits -->
<!ENTITY month "07"> <!-- Always 2 digits -->
<!ENTITY year "2012">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "July 12th, &year;">
+<!ENTITY releasedate "July 14th, &year;">
<!-- <!ENTITY releasedate "November &day;st, &year;"> -->
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
@@ -700,11 +700,11 @@
<!ENTITY kde-dldir "&kde-version;">
<!ENTITY kde-download-http "http://mirrors.isc.org/pub/kde/stable/";>
<!ENTITY kde-download-ftp "ftp://ftp.kde.org/pub/kde/stable/";>
-<!ENTITY kde-dir-var "KDE4_PREFIX">
+<!ENTITY kde-dir-var "KDE_PREFIX">
<!ENTITY kde-dir "$&kde-dir-var;">
<!ENTITY automoc4-version "0.9.88">
<!ENTITY phonon-version "4.6.0">
-<!ENTITY phonon-backend-gstreamer-version "4.6.0">
+<!ENTITY phonon-backend-gstreamer-version "4.6.1">
<!ENTITY phonon-backend-vlc-version "0.5.0">
<!ENTITY attica-version "0.4.0">
<!ENTITY akonadi-version "1.7.2">
Modified: trunk/BOOK/gnome/deprecated/libgnomeui.xml
===================================================================
--- trunk/BOOK/gnome/deprecated/libgnomeui.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/gnome/deprecated/libgnomeui.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -113,7 +113,7 @@
<!-- seems bogus, no kde dependencies. dashes changed to plus to keep it
as a valid comment
- <para><option>++with-kde-datadir=$KDE_PREFIX/share</option>: Use this
+ <para><option>++with-kde-datadir=&kde-dir;/share</option>: Use this
parameter if you have <application>KDE</application> installed in any
prefix
other than <filename class='directory'>/usr</filename>.</para>-->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-07-12 19:08:27 UTC
(rev 10412)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-07-14 10:38:15 UTC
(rev 10413)
@@ -42,6 +42,27 @@
-->
<listitem>
+ <para>July 14th, 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[rthomsen] - Changed the KDE system configuration file
+ installation directory from /etc/kde4 to /etc/kde.</para>
+ </listitem>
+ <listitem>
+ <para>[rthomsen] - Removed the cmake option
+ -DKDE_DEFAULT_HOME=.kde4 from KDE packages.</para>
+ </listitem>
+ <listitem>
+ <para>[rthomsen] - Use $KDE_PREFIX instead of $KDE4_PREFIX.</para>
+ </listitem>
+ <listitem>
+ <para>[rthomsen] - Phonon-backend-gstreamer 4.6.1.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+
+ <listitem>
<para>July 12th, 2012</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/kde4/add/add-pkgs.xml
===================================================================
--- trunk/BOOK/kde4/add/add-pkgs.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/add-pkgs.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -48,9 +48,8 @@
<para>Most of these packages can be built with the standard KDE
instructions:</para>
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
<para>And as the <systemitem class="username">root</systemitem> user:</para>
Modified: trunk/BOOK/kde4/add/ark.xml
===================================================================
--- trunk/BOOK/kde4/add/ark.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/ark.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -95,9 +95,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/gwenview.xml
===================================================================
--- trunk/BOOK/kde4/add/gwenview.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/gwenview.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -98,9 +98,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -128,7 +127,7 @@
<seglistitem>
<seg>gwenview and gwenview_importer</seg>
<seg>libgwenviewlib.so and gvpart.so</seg>
- <seg>several in $KDE4_PREFIX/share</seg>
+ <seg>several in &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/add/kate.xml
===================================================================
--- trunk/BOOK/kde4/add/kate.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kate.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -95,9 +95,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/kcalc.xml
===================================================================
--- trunk/BOOK/kde4/add/kcalc.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kcalc.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -93,9 +93,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -123,7 +122,7 @@
<seglistitem>
<seg>kcalc</seg>
<seg>libkdeinit4_kcalc.so</seg>
- <seg>several in $KDE4_PREFIX/share</seg>
+ <seg>several in &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/add/kde4admin.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4admin.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kde4admin.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -100,8 +100,7 @@
<screen><userinput>mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/kde4artwork.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4artwork.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kde4artwork.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -78,7 +78,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="libkexiv2"/>,
- <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE4) and
+ <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE) and
<ulink url="http://eigen.tuxfamily.org/";>Eigen</ulink> (to build the
krotation and kpendulum screensavers)
</para>
@@ -96,9 +96,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -128,8 +127,8 @@
keuphoria.kss, kflux.kss, kfountain.kss, kgravity.kss, klines.kss,
klorenz.kss, kpartsaver.kss, kpendulum.kss, kpolygon.kss,
krotation.kss,
kscience.kss, kslideshow.kss, ksolarwinds.kss, kvm.kss and
kwave.kss</seg>
- <seg>several in $KDE4_PREFIX/lib/kde4</seg>
- <seg>several in $KDE4_PREFIX/share</seg>
+ <seg>several in &kde-dir;/lib/kde4</seg>
+ <seg>several in &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/add/kde4multimedia.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4multimedia.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/add/kde4multimedia.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -102,9 +102,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -133,7 +132,7 @@
<seg>dragon, juk, kmix, kmixctrl, mplayerthumbsconfig</seg>
<seg>libaudiocdplugins.so, libkcddb.so, libkcompactdisc.so
libkdeinit4_kmixctrl.so, libkdeinit4_kmix.so</seg>
- <seg>several in /etc/kde4, $KDE4_PREFIX/include and
$KDE4_PREFIX/share</seg>
+ <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/add/kde4network.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4network.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kde4network.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -5,7 +5,7 @@
%general-entities;
<!ENTITY kdenetwork-download-http
"&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
- <!ENTITY kdenetwork-download-ftp
"&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
+ <!ENTITY kdenetwork-download-ftp
"&kde-download-ftp;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
<!ENTITY kdenetwork-md5sum "f6749a63de31ed16725bb71bd0eafaca">
<!ENTITY kdenetwork-size "8.5 MB">
<!ENTITY kdenetwork-buildsize "665 MB">
@@ -117,9 +117,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -150,8 +149,8 @@
krdc, krfb, winpopup-install and winpopup-send</seg>
<seg>libkgetcore.so, libkopete*.so, libkyahoo.so, liboscar.so,
libkrdccore.so, libkrfbprivate.so, libqgroupwise.so and several
- in $KDE4_PREFIX/lib/kde4</seg>
- <seg>several in $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
+ in &kde-dir;/lib/kde4</seg>
+ <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/add/kde4pim.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4pim.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/kde4pim.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -102,9 +102,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -136,7 +135,7 @@
kleopatra, kmail, kmail_mobile, kmail_antivir.sh, kmail_clamav.sh,
kmail_fprot.sh, kmail_sav.sh, kmailcvt,
knode, knotes, konsolekalendar, kontact, korgac, korganizer,
korganizer-mobile, ksendemail,
ktimetracker, kwatchgnupg, notes-mobile and tasks-mobile</seg>
- <seg>numerous in $KDE4_PREFIX/lib</seg>
+ <seg>numerous in &kde-dir;/lib</seg>
<seg></seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde4/add/kde4pimruntime.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4pimruntime.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/add/kde4pimruntime.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -94,9 +94,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/kde4plasmaaddons.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4plasmaaddons.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/add/kde4plasmaaddons.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -98,9 +98,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -129,7 +128,7 @@
<seg>lancelot</seg>
<seg>liblancelot-datamodels.so, liblancelot.so,
libplasma_groupingcontainment.so,
libplasmacomicprovidercore.so, libplasmapotdprovidercore.so,
libplasmaweather.so,
- librtm.so and several in $KDE4_PREFIX/lib/kde4</seg>
+ librtm.so and several in &kde-dir;/lib/kde4</seg>
<seg>...</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde4/add/konsole.xml
===================================================================
--- trunk/BOOK/kde4/add/konsole.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/konsole.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -93,9 +93,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/libkexiv2.xml
===================================================================
--- trunk/BOOK/kde4/add/libkexiv2.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/libkexiv2.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -95,9 +95,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/add/okular.xml
===================================================================
--- trunk/BOOK/kde4/add/okular.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/add/okular.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -109,8 +109,7 @@
<screen><userinput>mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
Modified: trunk/BOOK/kde4/core/config.xml
===================================================================
--- trunk/BOOK/kde4/core/config.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/core/config.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -50,7 +50,7 @@
First, setup run-level 5 to start KDM by adding the following line (adjust
the path to kdm according to your system):</para>
-<screen><userinput>kd:5:respawn:/opt/kde4/bin/kdm</userinput></screen>
+<screen><userinput>kd:5:respawn:&kde-dir;/bin/kdm</userinput></screen>
<para>Additionally, you need to change the default run-level from 3 to 5.
This
is done by changing the line:</para>
Modified: trunk/BOOK/kde4/core/kactivities.xml
===================================================================
--- trunk/BOOK/kde4/core/kactivities.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/kactivities.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -93,9 +93,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -123,7 +122,7 @@
<seglistitem>
<seg>kactivitymanagerd</seg>
<seg>libactivities.so and activitymanager_plugin_*.so</seg>
- <seg>$KDE4_PREFIX/include/kactivities and
$KDE4_PREFIX/include/KDE/KActivities</seg>
+ <seg>&kde-dir;/include/kactivities and
&kde-dir;/include/KDE/KActivities</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/kde4baseapps.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4baseapps.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/kde4baseapps.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -98,9 +98,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -131,7 +130,7 @@
servicemenuinstallation</seg>
<seg>libkonq.so, libdolphinprivate.so, libkbookmarkmodel_private.so,
libkdeinit4_keditbookmarks.so, libkonquerorprivate.so,
libkonqsidebarplugin.so,
- libkdeinit4_dolphin.so and several in $KDE4_PREFIX/lib/kde4</seg>
+ libkdeinit4_dolphin.so and several in &kde-dir;/lib/kde4</seg>
<seg>...</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde4/core/kde4libs.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4libs.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/core/kde4libs.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -5,7 +5,7 @@
%general-entities;
<!ENTITY kdelibs-download-http
"&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
- <!ENTITY kdelibs-download-ftp
"&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
+ <!ENTITY kdelibs-download-ftp
"&kde-download-ftp;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
<!ENTITY kdelibs-md5sum "c4987c838164bd9ee2787e77243fe4a9">
<!ENTITY kdelibs-size "11.4 MB">
<!ENTITY kdelibs-buildsize "1.7 GB">
@@ -124,9 +124,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$&kde-dir-var; \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
-DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
.. &&
make</userinput></screen>
@@ -140,9 +139,7 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>-DKDE_DEFAULT_HOME=.kde4</option>: This option is set to
- avoid clashes with a KDE3 installation on the same machine.</para>
- <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde4</option>: This option is set
to
+ <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde</option>: This option is set
to
install configuration files in /etc.</para>
<para><option>-DDOCBOOKXML_CURRENTDTD_DIR=...</option>: This option is
used to
find the DTDs.</para>
@@ -164,7 +161,7 @@
kshell4, kunittestmodrunner, kwrapper4, makekdewidgets, meinproc4,
meinproc_simple, nepomuk-rcgen and preparetips</seg>
<seg>several in &kde-dir;/lib</seg>
- <seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
+ <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/kde4pimlibs.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4pimlibs.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/kde4pimlibs.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -102,9 +102,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -131,8 +130,8 @@
<seglistitem>
<seg>none</seg>
- <seg>several in $KDE4_PREFIX/lib</seg>
- <seg>several in $KDE4_PREFIX/include</seg>
+ <seg>several in &kde-dir;/lib</seg>
+ <seg>several in &kde-dir;/include</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/kde4runtime.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4runtime.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/kde4runtime.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -107,8 +107,7 @@
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -143,7 +142,7 @@
nepomukserver, nepomukservicestub and nepomuk-simpleresource-rcgen,
plasmapkg,
plasma-remote-helper and solid-hardware</seg>
<seg>several in &kde-dir;/lib</seg>
- <seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
+ <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/kde4workspace.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4workspace.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/kde4workspace.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -31,7 +31,7 @@
<para>The Kde-workspace package contains components that are central to
providing the <application>KDE</application> desktop environment. Of
- particular importance are KWin, the <application>KDE4</application>
+ particular importance are KWin, the <application>KDE</application>
window manager, and Plasma, which provides the workspace interface.</para>
&lfs71_checked;
@@ -71,8 +71,9 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="kdelibs"/> and
- <xref linkend="kactivities"/>
+ <xref linkend="kdelibs"/>,
+ <xref linkend="kactivities"/> and
+ <xref linkend="qimageblitz"/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
@@ -113,9 +114,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
-DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
.. &&
make</userinput></screen>
@@ -130,7 +130,7 @@
<title>Command Explanations</title>
<para><option>-DPYTHON_SITE_PACKAGES_INSTALL...</option>: This option is
- set to install the KDE4 Python objects in the correct place.</para>
+ set to install the KDE Python objects in the correct place.</para>
</sect2>
@@ -151,8 +151,8 @@
oxygen-settings, oxygen-shadow-demo, plasma-desktop,
plasmaengineexplorer,
plasmawallpaperviewer, plasma-windowed, plasmoidviewer, solid-network,
solid-action-desktop-gen, startkde and systemsettings</seg>
- <seg>several in $KDE4_PREFIX/lib</seg>
- <seg>several in /etc/kde4, $KDE4_PREFIX/include and
$KDE4_PREFIX/share</seg>
+ <seg>several in &kde-dir;/lib</seg>
+ <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/oxygen-icons.xml
===================================================================
--- trunk/BOOK/kde4/core/oxygen-icons.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/oxygen-icons.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -114,7 +114,7 @@
<seglistitem>
<seg>none</seg>
<seg>none</seg>
- <seg>$KDE4_PREFIX/share/icons/oxygen</seg>
+ <seg>&kde-dir;/share/icons/oxygen</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml 2012-07-12 19:08:27 UTC
(rev 10412)
+++ trunk/BOOK/kde4/core/phonon-backend-gstreamer.xml 2012-07-14 10:38:15 UTC
(rev 10413)
@@ -6,9 +6,9 @@
<!ENTITY phonon-backend-gstreamer-download-http
"http://mirrors.isc.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz";>
<!ENTITY phonon-backend-gstreamer-download-ftp
"ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz";>
- <!ENTITY phonon-backend-gstreamer-md5sum
"cc380c7612aaaa87294185ded702f88a">
+ <!ENTITY phonon-backend-gstreamer-md5sum
"c0c8a1064e32c83dd6976187dcc491a3">
<!ENTITY phonon-backend-gstreamer-size "70 KB">
- <!ENTITY phonon-backend-gstreamer-buildsize "3.1 MB">
+ <!ENTITY phonon-backend-gstreamer-buildsize "4.0 MB">
<!ENTITY phonon-backend-gstreamer-time "0.3 SBU">
]>
@@ -32,7 +32,7 @@
<para>This package provides a <application>Phonon</application> backend
which
utilizes the <application>GStreamer</application> media framework.</para>
- &lfs70_checked;
+ &lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -85,8 +85,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -106,9 +105,9 @@
<title>Contents</title>
<segmentedlist>
- <segtitle>Installed Program</segtitle>
+ <segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
- <segtitle>Installed Directory</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>none</seg>
Modified: trunk/BOOK/kde4/core/phonon-backend-vlc.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon-backend-vlc.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/phonon-backend-vlc.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -87,8 +87,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
Modified: trunk/BOOK/kde4/core/polkit-qt.xml
===================================================================
--- trunk/BOOK/kde4/core/polkit-qt.xml 2012-07-12 19:08:27 UTC (rev 10412)
+++ trunk/BOOK/kde4/core/polkit-qt.xml 2012-07-14 10:38:15 UTC (rev 10413)
@@ -115,7 +115,7 @@
<seglistitem>
<seg>None</seg>
<seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so and
libpolkit-qt-gui-1.so</seg>
- <seg>$KDE4_PREFIX/include/polkit-qt-1</seg>
+ <seg>&kde-dir;/include/polkit-qt-1</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde4/core/qimageblitz.xml
===================================================================
--- trunk/BOOK/kde4/core/qimageblitz.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/kde4/core/qimageblitz.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -30,7 +30,7 @@
<title>Introduction to QImageblitz</title>
<para><application>QImageblitz</application> is a graphical effect and
- filter library for <application>KDE4</application>.</para>
+ filter library for <application>KDE</application>.</para>
&lfs70_checked;
@@ -86,7 +86,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -113,7 +113,7 @@
<seglistitem>
<seg>blitztest</seg>
<seg>libqimageblitz.so</seg>
- <seg>$KDE4_PREFIX/include/qimageblitz</seg>
+ <seg>&kde-dir;/include/qimageblitz</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde4/intro/pre-install-config.xml
===================================================================
--- trunk/BOOK/kde4/intro/pre-install-config.xml 2012-07-12 19:08:27 UTC
(rev 10412)
+++ trunk/BOOK/kde4/intro/pre-install-config.xml 2012-07-14 10:38:15 UTC
(rev 10413)
@@ -31,72 +31,57 @@
<application>KDE</application> in the <filename
class='directory'>/opt</filename> hierarchy:</para>
-<screen><userinput>export &kde-dir-var;=/opt/kde4</userinput></screen>
+<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
<para>If you are not installing <application>KDE</application> in
<filename class="directory">/usr</filename>, you will need to make some
additional configuration changes. Best practice is to add those to your
system or personal profile:</para>
-<screen><userinput>cat > /etc/profile.d/kde4.sh << "EOF"
-# Begin /etc/profile.d/kde4.sh
+<screen><userinput>cat > /etc/profile.d/kde.sh << "EOF"
+# Begin /etc/profile.d/kde.sh
-&kde-dir-var;=/opt/kde4
-KDE4DIR=&kde-dir;
+&kde-dir-var;=/opt/kde
KDEDIR=&kde-dir;
pathappend &kde-dir;/bin PATH
pathappend &kde-dir;/lib/pkgconfig PKG_CONFIG_PATH
pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
pathappend &kde-dir;/share XDG_DATA_DIRS
-pathappend /etc/kde4/xdg XDG_CONFIG_DIRS
+pathappend /etc/kde/xdg XDG_CONFIG_DIRS
-export KDE4_PREFIX KDE4DIR KDEDIR
+export &kde-dir-var; KDEDIR
-# End /etc/profile.d/kde4.sh
+# End /etc/profile.d/kde.sh
EOF
</userinput></screen>
<para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
<screen role="root"><userinput>cat >> /etc/ld.so.conf << "EOF"
-<literal># Begin kde4 addition
+<literal># Begin kde addition
-/opt/kde4/lib
+/opt/kde/lib
-# End kde4 addition</literal>
+# End kde addition</literal>
EOF</userinput></screen>
<indexterm zone="kde-pre-install-config">
<primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
</indexterm>
- <para>Add to your <filename>/etc/man_db.conf</filename>:</para>
-
-<screen role="root"><userinput>cat >> /etc/man_db.conf << "EOF"
-<literal># Begin kde4 addition
-
-MANDATORY_MANPATH /opt/kde4/man
-
-# End kde4 addition</literal>
-EOF</userinput></screen>
-
- <indexterm zone="kde-pre-install-config">
- <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
- </indexterm>
-
<para>Several KDE packages install files into D-Bus and polkit
directories.
When installing KDE in a location other than <filename
class="directory">/usr</filename>,
D-Bus and polkit need to find these files. The easiest way to achieve this
is to create
the following symlinks (as the <systemitem
class="username">root</systemitem> user):</para>
-<screen role="root"><userinput>install -d /opt/kde4/share &&
-ln -svf /usr/share/dbus-1 /opt/kde4/share &&
-ln -svf /usr/share/polkit-1 /opt/kde4/share</userinput></screen>
+<screen role="root"><userinput>install -d &kde-dir;/share &&
+ln -svf /usr/share/dbus-1 &kde-dir;/share &&
+ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
<para>D-Bus also needs to find the configuration files for the system-wide
bus, which, if you follow the books instructions, are installed in
- <filename class="directory">/etc/kde4/dbus-1/system.d</filename>.
+ <filename class="directory">/etc/kde/dbus-1/system.d</filename>.
Fix this by issuing the following (as
<systemitem class="username">root</systemitem>):</para>
@@ -107,25 +92,25 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
- <includedir>/etc/kde4/dbus-1/system.d</includedir>
+ <includedir>/etc/kde/dbus-1/system.d</includedir>
</busconfig></literal>
EOF</userinput></screen>
<tip>
<para>Sometimes, the installation paths are coded into installed files.
- This is the reason why <filename class="directory">/opt/kde4</filename>
+ This is the reason why <filename class="directory">/opt/kde</filename>
is used as installation prefix instead of <filename
class="directory">/opt/kde-&kde-version;</filename>. After installing
- <application>KDE4</application>, you may rename the directory and create
+ <application>KDE</application>, you may rename the directory and create
a symlink:</para>
-<screen role="root"><userinput>mv /opt/kde{4,-&kde-version;} &&
-ln -svf kde-&kde-version; /opt/kde4</userinput></screen>
+<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &&
+ln -svf kde-&kde-version; /opt/kde</userinput></screen>
<para>Later on, you may want to install other versions of
<application>KDE</application>. To do that, just remove the symlink and
- use <filename class="directory">/opt/kde4</filename> as the prefix again
+ use <filename class="directory">/opt/kde</filename> as the prefix again
(<application>KDE</application> must not be started). Which version of
<application>KDE</application> you use depends only on where the symlink
points to. No other reconfiguration will be needed.</para>
Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -5,7 +5,7 @@
%general-entities;
<!ENTITY amarok-download-http
"&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
- <!ENTITY amarok-download-ftp
"&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
+ <!ENTITY amarok-download-ftp
"&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
<!ENTITY amarok-md5sum "b7983eaa33e4771769ae9e330c811995">
<!ENTITY amarok-size "44 MB">
<!ENTITY amarok-buildsize "801 MB">
@@ -30,12 +30,12 @@
<title>Introduction to Amarok</title>
<para><application>Amarok</application> is a powerful audio player for
- the KDE4 environment.
+ the KDE environment.
Features include a context browser, integration with many online music
services and support for management of several digital music players
including Apple's iPod.</para>
- &lfs70_checked;
+ &lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -103,9 +103,8 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
.. &&
make</userinput></screen>
@@ -139,8 +138,8 @@
<seg>libamarok-sqlcollection.so, libamarok-transcoding.so,
libamarokcore.so, libamaroklib.so, libamarokocsclient.so,
libamarokpud.so, libampache_account_login.so and several
- libraries in $KDE4_PREFIX/lib/kde4</seg>
- <seg>several in $KDE4_PREFIX/share</seg>
+ libraries in &kde-dir;/lib/kde4</seg>
+ <seg>several in &kde-dir;/share</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/multimedia/cdwriteutils/k3b.xml
===================================================================
--- trunk/BOOK/multimedia/cdwriteutils/k3b.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/multimedia/cdwriteutils/k3b.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -141,9 +141,8 @@
commands:</para>
<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-1.patch
&&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
- -DKDE_DEFAULT_HOME=.kde4 \
- -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
-DK3B_ENABLE_HAL_SUPPORT=OFF \
.. &&
make</userinput></screen>
@@ -207,7 +206,7 @@
<seg>k3b and k3bsetup</seg>
<seg>libk3b.so, libk3bdevice.so and numerous
modules for the installed dependencies</seg>
- <seg>The following subdirectories of <envar>$KDE_PREFIX</envar>/share/:
+ <seg>The following subdirectories of <envar>&kde-dir;</envar>/share/:
applnk/Settings/System, apps/k3b, doc/HTML/en/k3b</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/server/other/virtuoso.xml
===================================================================
--- trunk/BOOK/server/other/virtuoso.xml 2012-07-12 19:08:27 UTC (rev
10412)
+++ trunk/BOOK/server/other/virtuoso.xml 2012-07-14 10:38:15 UTC (rev
10413)
@@ -158,7 +158,7 @@
<title>Configuration</title>
<note><para>If <application>Virtuoso</application> is only to be used
- for <application>KDE4</application>, there is no need to start the
+ for <application>KDE</application>, there is no need to start the
<application>Virtuoso</application> server at boot time.</para></note>
<sect3 id="virtuoso-init">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
