Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision b5f6f3a2fc815f56e3037bfe61b031f0ffc55367)
+++ introduction/welcome/changelog.xml (revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -46,4 +46,7 @@
+ [Bdubbs] - Update to kdeadmin-3.5.13.
+
+
[abenton] - Tiff 4.0.0.
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml (revision b5f6f3a2fc815f56e3037bfe61b031f0ffc55367)
+++ kde/add/kdeadmin.xml (revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -4,10 +4,10 @@
%general-entities;
-
-
-
-
-
-
+
+
+
+
+
+
]>
@@ -20,5 +20,5 @@
- Kdeadmin-&kde-version;
+ Kdeadmin-&trinity-version;
@@ -59,13 +59,19 @@
Required
-
+
+
+
Recommended
- and
-
+
+ and
+
+
Optional
- and
- LILO
+
+ and
+ LILO
+
User Notes:
@@ -88,6 +94,16 @@
Install kdeadmin with:
-./configure --prefix=&kde-dir; --disable-debug \
- --disable-dependency-tracking &&
+
+cp -v /usr/share/aclocal/libtool.m4 admin/libtool.m4.in &&
+cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh &&
+sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@" admin/acinclude.m4.in &&
+make -f admin/Makefile.common &&
+
+./configure --prefix=$TRINITY_PREFIX \
+ --enable-closure \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-extra-libs=$TRINITY_PREFIX/lib &&
+
make
@@ -97,4 +113,22 @@
make install
+
+
+
+
+ Command Explanations
+
+ cp -v /usr/share/... admin/...:
+ Ensure the .m4 files are consistent with the current autotools version.
+
+ sed ... admin/acinclude.m4.in:
+ Update the paths to the Trinity libraries.
+
+ make -f admin/Makefile.common: Create the configure
+ script.
+
+ --with-extra-libs=$TRINITY_PREFIX/lib: This
+ option ensure the Trinity libraries are found in the
+ Makefiles.
@@ -109,7 +143,7 @@
- kcron, kdat, kpackage, ksysv, and kuser
- None
- None
+ kcron, kdat, kpackage, ksysv, kuser, and secpolicy
+ kcm_knetworkconfmodule.so, kfile_deb.so, and kfile_rpm.so
+ $TRINITY_PREFIX/lib/trinity
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml (revision b5f6f3a2fc815f56e3037bfe61b031f0ffc55367)
+++ kde/core/kdebase.xml (revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -5,6 +5,6 @@
%general-entities;
-
-
+
+
@@ -13,5 +13,5 @@
]>
-
+
@@ -21,5 +21,5 @@
- Kdebase-&kde-version;
+ Kdebase-&trinity-version;
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml (revision b5f6f3a2fc815f56e3037bfe61b031f0ffc55367)
+++ kde/core/kdelibs.xml (revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -13,5 +13,5 @@
]>
-
+
@@ -21,5 +21,5 @@
- Kdelibs-&kde-version;
+ Kdelibs-&trinity-version;
@@ -56,13 +56,5 @@
-
+
Kdelibs Dependencies
Index: kde/core/tqtinterface.xml
===================================================================
--- kde/core/tqtinterface.xml (revision b5f6f3a2fc815f56e3037bfe61b031f0ffc55367)
+++ kde/core/tqtinterface.xml (revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -85,5 +85,5 @@
cd $BUILD &&
-cmake $TGT \
+cmake $TQT \
-DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
-DCMAKE_VERBOSE_MAKEFILE=ON \