Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

42 files changed, 1013 insertions, 3 deletions

diff --git a/arch/calvin/trinity-qt3/189checkservices.sh b/arch/calvin/trinity-qt3/189checkservices.sh
new file mode 100644
index 000000000..bca50c93d
--- /dev/null
+++ b/arch/calvin/trinity-qt3/189checkservices.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+IP_ADDRESS_1=97.64.229.82
+IP_ADDRESS_2=97.64.229.83
+
+STATUS_1=0
+STATUS_2=0
+
+CURDATE=$('date')
+
+netcat -z ${IP_ADDRESS_1} 80
+if [ $? -eq 0 ]
+then
+    STATUS_1=1
+else
+    sleep 5
+    netcat -z ${IP_ADDRESS_1} 80
+    if [ $? -eq 0 ]
+    then
+        STATUS_1=1
+    else
+        echo "Interface 1 is DOWN"
+    fi
+fi
+
+netcat -z ${IP_ADDRESS_2} 80
+if [ $? -eq 0 ]
+then
+    STATUS_2=1
+else
+    sleep 5
+    netcat -z ${IP_ADDRESS_2} 80
+    if [ $? -eq 0 ]
+    then
+        STATUS_2=1
+    else
+        echo "Interface 2 is DOWN"
+    fi
+fi
+
+if [[ STATUS_1 == 0 ]]; then
+    mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_1}:80 failed to respond on ${CURDATE}"
+fi
+
+if [[ STATUS_2 == 0 ]]; then
+    mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_2}:80 failed to respond on ${CURDATE}"
+fi
diff --git a/arch/calvin/trinity-qt3/PKGBUILD b/arch/calvin/trinity-qt3/PKGBUILD
new file mode 100644
index 000000000..efa19d7f5
--- /dev/null
+++ b/arch/calvin/trinity-qt3/PKGBUILD
@@ -0,0 +1,90 @@
+# Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
+pkgname=trinity-qt3
+pkgver=20110907
+pkgrel=1
+pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
+_prefix="/opt/qt"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://trinitydesktop.org"
+# install=qt.install
+groups=('trinity')
+depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu'  'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc')
+makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
+optdepends=()
+# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+provides=('trinity-qt3' 'qt3')
+conflicts=('qt3' 'qt3-enhanced')
+replaces=('trinity-qt3')
+_prefix="opt/qt3"
+source=()
+options=(!libtool)
+
+
+_gitroot="http://scm.trinitydesktop.org/scm/git/tde"
+_gitname="tde/main/dependencies/qt3"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $_gitroot 
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+
+  
+  cd "$srcdir/$_gitname"
+
+
+
+ # remove unwanted mkspecs
+  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+
+  # set arch if x86_64 build
+  if [ "$CARCH" = "x86_64" ]; then
+      export ARCH="-64"
+    else unset ARCH
+  fi
+
+#   ./configure -prefix /opt/qt -platform linux-g++$ARCH \
+#     -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
+#     -system-lib{png,jpeg,mng} \
+#     -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
+
+ 
+  msg "Starting configure..."
+  ./configure 	-prefix ${_prefix} \
+		-sysconfdir /etc/qt \
+		-qt-gif \
+		-system-zlib \
+		-system-libjpeg \
+		-plugin-imgfmt-jpeg \
+		-system-libmng \
+		-plugin-imgfmt-mng \
+		-system-libpng \
+		-plugin-imgfmt-png \
+		-plugin-sql-mysql \
+		-plugin-sql-psql \
+		-plugin-sql-sqlite \
+		-no-exceptions \
+		-thread \
+		-no-tablet
+		#-platform linux-g++ 
+  make -C qmake || return 1
+  make 
+
+}
+
+package() {
+
+echo $PWD
+echo "woooot!"
+ make DESTDIR=${pkgdir} install
+} 
diff --git a/arch/calvin/trinity-qt3/PKGBUILD-old b/arch/calvin/trinity-qt3/PKGBUILD-old
new file mode 100644
index 000000000..1a38195e9
--- /dev/null
+++ b/arch/calvin/trinity-qt3/PKGBUILD-old
@@ -0,0 +1,276 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgname=trinity-qt3
+pkgver=3.3.8b
+pkgrel=1
+pkgdesc="The Qt3 gui toolkit - with Trinity patch."
+_prefix="opt/qt"
+_patchver=3.3.8c
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.trolltech.com/products/qt/index.html"
+pkgfqn=qt-x11-free-${pkgver}
+# install=qt.install
+groups=('trinity-bld')
+depends=('libjpeg-turbo'
+	'libmng'
+        'libmysqlclient'
+        'libpng'
+        'libxmu'
+        'libxcursor'
+        'libxinerama'
+	'libxft'
+	'libxrandr'
+        'mesa'
+        'postgresql-libs'
+	'unixodbc')
+makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
+optdepends=()
+# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+provides=('trinity-qt3' 'qt3')
+conflicts=('qt3' 'qt3-enhanced')
+replaces=('trinity-qt3')
+# 'ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz'
+# ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz
+source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz
+        qt3-png14.patch
+	qt-patches.tar.bz2
+	qt3-png14.patch
+	eastern_asian_languagues.diff
+	qt-odbc.patch
+        gcc46-arch.diff
+	qt3_3.3.8c.arch.diff)
+# 	'qt.profile'
+# 	'qt-copy-kde-patches.tar.bz2'
+# 	'utf8-bug-qt3.diff'
+# 	'mysql.patch'
+# 	'qt-font-default-subst.diff'
+options=(!libtool)
+md5sums=('9f05b4125cfe477cc52c9742c3c09009'
+         '1dc671df42b9030dbdf68bb61cd3375e'
+         '2f00e5c0c1e2c2a23dddc982cd79f3e0'
+         '1dc671df42b9030dbdf68bb61cd3375e'
+         '616f1f3029cf8375256ad6a406de3549'
+         '2178ca88dfd75a230918593b30eb0dbe'
+         '445d6937ad197fa31e1a8e4668d3caa6'
+         'd763bdc087786a45e5e5eec84f5c9896')
+
+#         gcc46.diff
+#          'e77192301879b05a4b8ebc35d5c5702b'
+
+# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
+# other qt-patches come from fedora and gentoo
+
+build() {
+  unset QMAKESPEC
+  export QTDIR=${srcdir}/$pkgfqn
+  export PATH=${QTDIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+  export CPATH=/usr/include/postgresql/server:/usr/include/mysql
+
+  cd ${QTDIR}
+#   cd ${srcdir}/$pkgfqn
+
+  # apply other qt patches and one security fix from debian/gentoo
+  for i in ../qt-patches/*; do
+    patch -Np1 -i $i || return 1
+  done
+  # fix CJK font/chars select error (FS#11245)
+  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
+  # fix build problem against new unixODBC
+  patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
+  patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
+
+  # patch for gcc 4.6
+  patch -p1 -i ${srcdir}/gcc46-arch.diff || return 1
+
+  # patch for qt3_3.3.8c
+  patch -p0 -i ${srcdir}/qt3_3.3.8c.arch.diff || return 1
+
+  # start compiling qt
+  # baho additions
+# 	# remove runtime library search not needed when installed into /usr
+# 	sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
+  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
+  rm -rf doc/html examples tutorial
+  sed -i "s|sub-tutorial sub-examples||" Makefile
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
+  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
+  sed -i "s|read acceptance|acceptance=yes|" configure
+
+ # remove unwanted mkspecs
+  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+
+  # set arch if x86_64 build
+  if [ "$CARCH" = "x86_64" ]; then
+      export ARCH="-64"
+    else unset ARCH
+  fi
+
+#   ./configure -prefix /opt/qt -platform linux-g++$ARCH \
+#     -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
+#     -system-lib{png,jpeg,mng} \
+#     -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
+
+  msg "Starting configure..."
+  ./configure 	-prefix ${_prefix} \
+		-sysconfdir /etc/qt \
+		-qt-gif \
+		-system-zlib \
+		-system-libjpeg \
+		-plugin-imgfmt-jpeg \
+		-system-libmng \
+		-plugin-imgfmt-mng \
+		-system-libpng \
+		-plugin-imgfmt-png \
+		-plugin-sql-mysql \
+		-plugin-sql-psql \
+		-plugin-sql-sqlite \
+		-plugin-sql-odbc \
+		-no-exceptions \
+		-thread \
+		-no-tablet
+		#-platform linux-g++ \
+
+## remove custom locations from Baho's /usr install experiment
+# 		-docdir ${_prefix}/share/doc/qt \
+# 		-headerdir ${_prefix}/include/qt \
+# 		-plugindir ${_prefix}/lib/qt/plugins \
+# 		-datadir ${_prefix}/share/qt \
+# 		-translationdir ${_prefix}/share/qt/translations \
+
+  # fix /opt/qt/lib path
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
+
+#  bahoo make
+#   make sub-tools
+
+  cd ${QTDIR}
+  make -C qmake || return 1
+  cd ${QTDIR}/plugins/src/sqldrivers/mysql
+  ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+  cd ${QTDIR}/plugins/src/sqldrivers/psql
+  ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+
+  cd ${QTDIR}
+  # fix the broken makefiles
+  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+  make || return 1
+
+}
+
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${QTDIR}
+  pkgver=${_patchver}
+  make INSTALL_ROOT=${pkgdir} install
+
+  ## Original Qt Build
+  rm -rf ${pkgdir}${_prefix}/{phrasebooks,templates,translations}
+  sed -i "s|-L${QTDIR}/lib ||g" ${pkgdir}${_prefix}/lib/*.prl
+  install -D -m755 qmake/qmake ${pkgdir}${_prefix}/bin/qmake
+
+  # Build and install qt.profile
+  echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+  echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+  echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+  echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+  install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+
+  ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
+  rm -f ${pkgdir}${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+
+  # install man pages
+  mkdir -p ${pkgdir}${_prefix}/man
+  cp -r ${QTDIR}/doc/man/{man1,man3} ${pkgdir}${_prefix}/man/
+
+  # Uncomment to install examples
+#   cp -v -r ${QTDIR}/examples ${pkgdir}${_prefix}/share/doc/qt
+
+  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+  echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
+
+}
+
+  ## Baho Additions
+
+# 	ln -v -sf libqt-mt.so ${pkgdir}${_prefix}/lib/libqt.so
+# 	ln -v -snf ../../bin ${pkgdir}${_prefix}/share/qt/bin
+# 	ln -v -snf ../../include/qt ${pkgdir}${_prefix}/share/qt/include
+# 	ln -v -snf ../../lib ${pkgdir}${_prefix}/share/qt/lib
+# 	rm ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
+# 	ln -v -snf ../linux-g++ ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
+# 	cp -v -r doc/man ${pkgdir}${_prefix}/share
+# 	#	Don't do examples
+# 	cp -v -r examples ${pkgdir}${_prefix}/share/doc/qt
+# 	#	Build qt.profile
+# 	echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+# 	echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+# 	echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+# 	echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+#
+# 	install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+# 	ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
+
+
+## scraps
+  # apply qt patches from kde.org
+#   for i in ../qt-copy-kde-patches/*; do
+#     patch -Np0 -i $i || return 1
+#   done
+  # fix utf8 bug
+#   patch -Np0 -i ../utf8-bug-qt3.diff || return 1
+  # fix asia fonts
+#   patch -Np0 -i ../qt-font-default-subst.diff || return 1
+  # fix segfaults on exit when using mysql DB driver
+#   patch -Np0 -i ../mysql.patch || return 1
+
+#   # fix /opt/qt/lib path
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
+#
+#   cd ${srcdir}/$pkgfqn
+#   make -C qmake || return 1
+#   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
+#   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+#   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
+#   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+#
+#   cd ${srcdir}/$pkgfqn
+#   # fix the broken makefiles
+#   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+#   make || return 1
+#   make INSTALL_ROOT=${pkgdir} install
+#   rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
+#   sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
+#   install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake
+#   install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+#   ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config
+#   rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+#
+#   # install man pages
+#   mkdir -p ${pkgdir}/opt/qt/man
+#   cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
+#
+#   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+#   echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
+# }
diff --git a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff
new file mode 100644
index 000000000..7c25eef7d
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff
@@ -0,0 +1,39 @@
+--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
+@@ -966,20 +966,22 @@
+ 
+ #ifdef Q_WS_X11
+     if (script == QFont::Han) {
+-	// modify script according to locale
+-	static QFont::Script defaultHan = QFont::UnknownScript;
+-	if (defaultHan == QFont::UnknownScript) {
+-	    QCString locale = setlocale(LC_ALL, NULL);
+-	    if (locale.contains("ko"))
+-		defaultHan = QFont::Han_Korean;
+-	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
+-		defaultHan = QFont::Han_TraditionalChinese;
+-	    else if (locale.contains("zh"))
+-		defaultHan = QFont::Han_SimplifiedChinese;
+-	    else
+-		defaultHan = QFont::Han_Japanese;
+-	}
+-	script = defaultHan;
++        // modify script according to locale
++        static QFont::Script defaultHan;
++        QCString locale = setlocale(LC_ALL, NULL);
++
++        if (locale.contains("ko"))
++            defaultHan = QFont::Han_Korean;
++        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
++            defaultHan = QFont::Han_TraditionalChinese;
++        else if (locale.contains("zh"))
++            defaultHan = QFont::Han_SimplifiedChinese;
++        else if (locale.contains("ja"))
++            defaultHan = QFont::Han_Japanese;
++        else
++            defaultHan = QFont::Han; // don't change
++
++        script = defaultHan;
+     }
+ #endif
+ 
diff --git a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff
new file mode 100644
index 000000000..caa9bfc44
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff
@@ -0,0 +1,61 @@
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-05-10 08:47:27.000000000 -0500
+@@ -50,6 +50,7 @@
+ #endif // QT_H
+ 
+ #ifndef QT_NO_STL
++#include <cstddef>
+ #include <iterator>
+ #include <map>
+ #endif
+@@ -107,7 +108,7 @@
+ #endif
+     typedef T          value_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+@@ -223,7 +224,7 @@
+ #endif
+     typedef T          value_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+@@ -604,7 +605,7 @@
+     typedef value_type& reference;
+     typedef const value_type& const_reference;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-05-10 08:46:46.000000000 -0500
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-05-10 08:46:46.000000000 -0500
+@@ -244,7 +244,7 @@
+     typedef const value_type& const_reference;
+     typedef size_t size_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+ #else
+     typedef int difference_type;
+ #endif
diff --git a/arch/calvin/trinity-qt3/old-patches/mysql.patch b/arch/calvin/trinity-qt3/old-patches/mysql.patch
new file mode 100644
index 000000000..5f61edc67
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/mysql.patch
@@ -0,0 +1,47 @@
+--- src/sql/drivers/mysql/qsql_mysql.cpp
++++ src/sql/drivers/mysql/qsql_mysql.cpp
+@@ -37,7 +37,6 @@
+ #include "qsql_mysql.h"
+ #include <private/qsqlextension_p.h>
+ 
+-#include <qapplication.h>
+ #include <qdatetime.h>
+ #include <qvaluevector.h>
+ #include <qsqlrecord.h>
+@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
+ }
+ 
+ /////////////////////////////////////////////////////////
+-static void qServerEnd()
+-{
+-#ifndef Q_NO_MYSQL_EMBEDDED
+-# if MYSQL_VERSION_ID >= 40000
+-    mysql_server_end();
+-# endif // MYSQL_VERSION_ID
+-#endif // Q_NO_MYSQL_EMBEDDED
+-}
+ 
+ static void qServerInit()
+ {
+@@ -366,9 +357,7 @@ static void qServerInit()
+ 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
+ #  endif
+     }
+-    qAddPostRoutine(qServerEnd);
+     init = TRUE;    
+-    
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ }
+@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
+ 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
+ 	delete ext;
+     }
++#ifndef Q_NO_MYSQL_EMBEDDED
++# if MYSQL_VERSION_ID > 40000
++    mysql_server_end();
++# endif
++#endif
+ }
+ 
+ bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2
new file mode 100644
index 000000000..19d899963
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff b/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff
new file mode 100644
index 000000000..3e286f74e
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff
@@ -0,0 +1,77 @@
+--- src/kernel/qfontdatabase_x11.cpp
++++ src/kernel/qfontdatabase_x11.cpp
+@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
+ 	    if (script == QFont::Latin)
+ 		// add Euro character
+ 		FcCharSetAddChar(cs, 0x20ac);
+-	    if (script == QFont::Han_SimplifiedChinese)
+-		FcCharSetAddChar(cs, 0x3400);
+-	    if (script == QFont::Han_TraditionalChinese){
+-		FcCharSetAddChar(cs, 0x3435);
+-		FcCharSetAddChar(cs, 0xE000);
+-		FcCharSetAddChar(cs, 0xF6B1);
+-	    }
+-	    if (script == QFont::MiscellaneousSymbols)
+-		FcCharSetAddChar(cs, 0x2714);
+ 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
+ 	    FcCharSetDestroy(cs);
+ 	}
+@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
+     FcPatternPrint(pattern);
+ #endif
+ 
++    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
++    // FcFontMatch/Sort here we have to do it manually.
+     FcConfigSubstitute(0, pattern, FcMatchPattern);
++    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
++
+ //     qDebug("1: pattern contains:");
+ //     FcPatternPrint(pattern);
+ 
+@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
+ 	    value.u.s = (const FcChar8 *)cs.data();
+ 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
+ 	}
+-#ifdef FONT_MATCH_DEBUG
+-	printf("final pattern contains:\n");
+-	FcPatternPrint(pattern);
+-#endif
+     }
+ 
+     if (script != QFont::Unicode) {
+@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
+         if (script == QFont::Latin)
+             // add Euro character
+             FcCharSetAddChar(cs, 0x20ac);
+-	if (script == QFont::Han_SimplifiedChinese)
+-	    FcCharSetAddChar(cs, 0x3400);
+-	if (script == QFont::Han_TraditionalChinese) {
+-	    FcCharSetAddChar(cs, 0x3435);
+-	    FcCharSetAddChar(cs, 0xE000);
+-	    FcCharSetAddChar(cs, 0xF6B1);
+-	}
+-	if (script == QFont::MiscellaneousSymbols)
+-	    FcCharSetAddChar(cs, 0x2714);
+         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
+         FcCharSetDestroy(cs);
+     }
+ 
++#ifdef FONT_MATCH_DEBUG
++	printf("final pattern contains:\n");
++	FcPatternPrint(pattern);
++#endif
++
+     QFontEngine *fe = 0;
+ 
+     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
+--- src/kernel/qfontdatabase.cpp
++++ src/kernel/qfontdatabase.cpp
+@@ -554,7 +554,7 @@ static const unsigned short sample_chars
+     // GeometricSymbols,
+     { 0x2500, 0x0 },
+     // MiscellaneousSymbols,
+-    { 0x2640, 0x0 },
++    { 0x2640, 0x2714, 0x0 },
+     // EnclosedAndSquare,
+     { 0x2460, 0x0 },
+     // Braille,
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch
new file mode 100644
index 000000000..6f21e3cf1
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch
@@ -0,0 +1,19 @@
+diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
+--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
+@@ -57,13 +57,13 @@
+ #endif
+ 
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#ifdef SQLLEN
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+ 
+-#ifdef SQLULEN
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2
new file mode 100644
index 000000000..3f4aee171
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2
diff --git a/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch b/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch
new file mode 100644
index 000000000..e8a194529
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch
@@ -0,0 +1,33 @@
+--- src/kernel/qpngio.cpp.orig	2010-01-16 22:02:41.000000000 +0100
++++ src/kernel/qpngio.cpp	2010-01-16 22:03:56.000000000 +0100
+@@ -159,7 +159,7 @@
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		const int g = info_ptr->trans_color.gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    info_ptr->trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;
+@@ -321,9 +321,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+ 	QRgb trans = 0xFF000000 | qRgb(
+-	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++	      (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++	      (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++	      (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ 	for (uint y=0; y<height; y++) {
+ 	    for (uint x=0; x<info_ptr->width; x++) {
+ 		if (((uint**)jt)[y][x] == trans) {
diff --git a/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff b/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff
new file mode 100644
index 000000000..39c751a71
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff
@@ -0,0 +1,72 @@
+--- include/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ include/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
+--- src/kernel/qobject.cpp	2008-01-15 13:09:13.000000000 -0600
++++ src/kernel/qobject.cpp	2011-01-01 18:28:16.191270264 -0600
+@@ -360,6 +360,30 @@
+     }
+ }
+
++/*! \internal
++    TQt compatibility function
++*/
++QObjectList QObject::childrenListObject() {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::childrenListObject() const {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::objectTreesListObject() {
++	if (objectTrees()) return *(objectTrees());
++	else return QObjectList();
++}
++
+
+ /*****************************************************************************
+   QObject member functions
+--- src/kernel/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ src/kernel/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
+--- src/tools/qglobal.h	2008-01-15 21:09:13.000000000 +0200
++++ src/tools/qglobal.h	2011-03-15 00:28:11.221711757 +0200
+@@ -41,7 +41,7 @@
+ #ifndef QGLOBAL_H
+ #define QGLOBAL_H
+
+-#define QT_VERSION_STR   "3.3.8b"
++#define QT_VERSION_STR   "3.3.8c"
+ /*
+    QT_VERSION is (major << 16) + (minor << 8) + patch.
+  */
diff --git a/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff b/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff
new file mode 100644
index 000000000..43e84a99f
--- /dev/null
+++ b/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff
@@ -0,0 +1,101 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -154,6 +154,7 @@
+ 
+ class QUtf8Decoder : public QTextDecoder {
+     uint uc;
++    uint min_uc;
+     int need;
+     bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+ 	result.setLength( len ); // worst case
+ 	QChar *qch = (QChar *)result.unicode();
+ 	uchar ch;
++        int error = -1;
+ 	for (int i=0; i<len; i++) {
+-	    ch = *chars++;
++	    ch = chars[i];
+ 	    if (need) {
+ 		if ( (ch&0xc0) == 0x80 ) {
+ 		    uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+ 			    *qch++ = QChar(high);
+ 			    *qch++ = QChar(low);
+ 			    headerDone = TRUE;
++			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                            *qch++ = QChar::replacement;
+ 			} else {
+ 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
+ 				*qch++ = uc;
+@@ -190,6 +194,7 @@
+ 		    }
+ 		} else {
+ 		    // error
++                    i = error;
+ 		    *qch++ = QChar::replacement;
+ 		    need = 0;
+ 		}
+@@ -200,12 +205,21 @@
+ 		} else if ((ch & 0xe0) == 0xc0) {
+ 		    uc = ch & 0x1f;
+ 		    need = 1;
++                    error = i;
++		    min_uc = 0x80;
+ 		} else if ((ch & 0xf0) == 0xe0) {
+ 		    uc = ch & 0x0f;
+ 		    need = 2;
++                    error = i;
++		    min_uc = 0x800;
+ 		} else if ((ch&0xf8) == 0xf0) {
+ 		    uc = ch & 0x07;
+ 		    need = 3;
++                    error = i;
++                    min_uc = 0x10000;
++                } else {
++                    // error
++                    *qch++ = QChar::replacement;
+ 		}
+ 	    }
+ 	}
+--- src/tools/qstring.cpp
++++ src/tools/qstring.cpp
+@@ -5805,6 +5805,7 @@
+     result.setLength( len ); // worst case
+     QChar *qch = (QChar *)result.unicode();
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -5822,6 +5823,12 @@
+ 			unsigned short low = uc%0x400 + 0xdc00;
+ 			*qch++ = QChar(high);
+ 			*qch++ = QChar(low);
++		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++			// overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = QChar(0xdbff);
++                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
+ 		    } else {
+ 			*qch++ = uc;
+ 		    }
+@@ -5844,14 +5851,17 @@
+ 		uc = ch & 0x1f;
+ 		need = 1;
+ 		error = i;
++		min_uc = 0x80;
+ 	    } else if ((ch & 0xf0) == 0xe0) {
+ 		uc = ch & 0x0f;
+ 		need = 2;
+ 		error = i;
++		min_uc = 0x800;
+ 	    } else if ((ch&0xf8) == 0xf0) {
+ 		uc = ch & 0x07;
+ 		need = 3;
+ 		error = i;
++		min_uc = 0x10000;
+ 	    } else {
+ 	        // Error
+                 qch = addOne(qch, result);
diff --git a/arch/calvin/trinity-qt3/qt.install b/arch/calvin/trinity-qt3/qt.install
new file mode 100644
index 000000000..6d042daae
--- /dev/null
+++ b/arch/calvin/trinity-qt3/qt.install
@@ -0,0 +1,12 @@
+post_install() {
+	post_remove
+}
+
+post_upgrade() {
+	post_remove
+}
+
+post_remove() {
+	# this can be removed in future versions
+	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
+}
diff --git a/arch/calvin/trinity-qt3/qt.profile b/arch/calvin/trinity-qt3/qt.profile
new file mode 100644
index 000000000..ed4d232ae
--- /dev/null
+++ b/arch/calvin/trinity-qt3/qt.profile
@@ -0,0 +1,4 @@
+export QTDIR=/opt/qt
+export QT_XFT=true
+export PATH=$PATH:$QTDIR/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdebase/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-doc.install b/debian/lenny/kdebase/debian/kdebase-trinity-doc.install
index e69de29bb..97134583f 100644
--- a/debian/lenny/kdebase/debian/kdebase-trinity-doc.install
+++ b/debian/lenny/kdebase/debian/kdebase-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebase-apidocs/*
diff --git a/debian/lenny/kdelibs/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdelibs/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..d29480355 100644
--- a/debian/lenny/kdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdelibs/debian/cdbs/debian-qt-kde.mk
@@ -25,3 +25,15 @@ clean::
 	rm -f debian/stamp-man-pages
 
 endif
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/lenny/kdelibs/debian/kdelibs4-doc-trinity.install b/debian/lenny/kdelibs/debian/kdelibs4-doc-trinity.install
deleted file mode 100644
index 13d5ca6a8..000000000
--- a/debian/lenny/kdelibs/debian/kdelibs4-doc-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs*-apidocs/*	/usr/share/doc/kde/HTML/en/kdelibs-apidocs
diff --git a/debian/lenny/kdelibs/debian/kdelibs4-trinity-dev.install b/debian/lenny/kdelibs/debian/kdelibs4-trinity-dev.install
index 91f4cac93..10607cdf8 100644
--- a/debian/lenny/kdelibs/debian/kdelibs4-trinity-dev.install
+++ b/debian/lenny/kdelibs/debian/kdelibs4-trinity-dev.install
@@ -685,6 +685,7 @@ debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h
 debian/tmp/opt/trinity/include/libkrandr/libkrandr.h
 debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h
 debian/tmp/opt/trinity/include/libkrandr/randr.h
+debian/tmp/opt/trinity/include/libkrsync/krsync.h
 debian/tmp/opt/trinity/include/libkmid/alsaout.h
 debian/tmp/opt/trinity/include/libkmid/dattypes.h
 debian/tmp/opt/trinity/include/libkmid/deviceman.h
@@ -799,6 +800,8 @@ debian/tmp/opt/trinity/lib/libkparts.la
 debian/tmp/opt/trinity/lib/libkparts.so
 debian/tmp/opt/trinity/lib/libkrandr.la
 debian/tmp/opt/trinity/lib/libkrandr.so
+debian/tmp/opt/trinity/lib/libkrsync.la
+debian/tmp/opt/trinity/lib/libkrsync.so
 debian/tmp/opt/trinity/lib/libkresources.la
 debian/tmp/opt/trinity/lib/libkresources.so
 debian/tmp/opt/trinity/lib/libkscreensaver.la
diff --git a/debian/lenny/kdelibs/debian/kdelibs4-trinity-doc.install b/debian/lenny/kdelibs/debian/kdelibs4-trinity-doc.install
new file mode 100644
index 000000000..09f34bbc7
--- /dev/null
+++ b/debian/lenny/kdelibs/debian/kdelibs4-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs-apidocs/*
diff --git a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
index d945126bf..6ee941938 100644
--- a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -290,6 +290,8 @@ debian/tmp/opt/trinity/lib/libkparts.so.2
 debian/tmp/opt/trinity/lib/libkparts.so.2.1.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95
+debian/tmp/opt/trinity/lib/libkrsync.so.0
+debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1
 debian/tmp/opt/trinity/lib/libkresources.so.1
 debian/tmp/opt/trinity/lib/libkresources.so.1.2.0
 debian/tmp/opt/trinity/lib/libkscreensaver.so.4
diff --git a/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdepim/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/lenny/kdepim/debian/rules b/debian/lenny/kdepim/debian/rules
index 6d8c87f14..07237352d 100755
--- a/debian/lenny/kdepim/debian/rules
+++ b/debian/lenny/kdepim/debian/rules
@@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
+DEB_KDE_APIDOX := yes
+
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
 -DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON"
diff --git a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install b/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install
index e69de29bb..97134583f 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install
+++ b/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebase-apidocs/*
diff --git a/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..d29480355 100644
--- a/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk
@@ -25,3 +25,15 @@ clean::
 	rm -f debian/stamp-man-pages
 
 endif
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-doc-trinity.install b/debian/squeeze/kdelibs/debian/kdelibs4-doc-trinity.install
deleted file mode 100644
index 13d5ca6a8..000000000
--- a/debian/squeeze/kdelibs/debian/kdelibs4-doc-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs*-apidocs/*	/usr/share/doc/kde/HTML/en/kdelibs-apidocs
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install b/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install
index 91f4cac93..10607cdf8 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install
+++ b/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install
@@ -685,6 +685,7 @@ debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h
 debian/tmp/opt/trinity/include/libkrandr/libkrandr.h
 debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h
 debian/tmp/opt/trinity/include/libkrandr/randr.h
+debian/tmp/opt/trinity/include/libkrsync/krsync.h
 debian/tmp/opt/trinity/include/libkmid/alsaout.h
 debian/tmp/opt/trinity/include/libkmid/dattypes.h
 debian/tmp/opt/trinity/include/libkmid/deviceman.h
@@ -799,6 +800,8 @@ debian/tmp/opt/trinity/lib/libkparts.la
 debian/tmp/opt/trinity/lib/libkparts.so
 debian/tmp/opt/trinity/lib/libkrandr.la
 debian/tmp/opt/trinity/lib/libkrandr.so
+debian/tmp/opt/trinity/lib/libkrsync.la
+debian/tmp/opt/trinity/lib/libkrsync.so
 debian/tmp/opt/trinity/lib/libkresources.la
 debian/tmp/opt/trinity/lib/libkresources.so
 debian/tmp/opt/trinity/lib/libkscreensaver.la
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-doc.install b/debian/squeeze/kdelibs/debian/kdelibs4-trinity-doc.install
new file mode 100644
index 000000000..09f34bbc7
--- /dev/null
+++ b/debian/squeeze/kdelibs/debian/kdelibs4-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs-apidocs/*
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
index d945126bf..6ee941938 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -290,6 +290,8 @@ debian/tmp/opt/trinity/lib/libkparts.so.2
 debian/tmp/opt/trinity/lib/libkparts.so.2.1.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95
+debian/tmp/opt/trinity/lib/libkrsync.so.0
+debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1
 debian/tmp/opt/trinity/lib/libkresources.so.1
 debian/tmp/opt/trinity/lib/libkresources.so.1.2.0
 debian/tmp/opt/trinity/lib/libkscreensaver.so.4
diff --git a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/debian/squeeze/kdepim/debian/rules b/debian/squeeze/kdepim/debian/rules
index 6d8c87f14..07237352d 100755
--- a/debian/squeeze/kdepim/debian/rules
+++ b/debian/squeeze/kdepim/debian/rules
@@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
+DEB_KDE_APIDOX := yes
+
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
 -DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON"
diff --git a/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install b/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install
index e69de29bb..97134583f 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install
+++ b/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebase-apidocs/*
diff --git a/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..d29480355 100644
--- a/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk
@@ -25,3 +25,15 @@ clean::
 	rm -f debian/stamp-man-pages
 
 endif
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-doc-trinity.install b/ubuntu/maverick/kdelibs/debian/kdelibs4-doc-trinity.install
deleted file mode 100644
index 13d5ca6a8..000000000
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-doc-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs*-apidocs/*	/usr/share/doc/kde/HTML/en/kdelibs-apidocs
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install b/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install
index 91f4cac93..10607cdf8 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install
@@ -685,6 +685,7 @@ debian/tmp/opt/trinity/include/libkrandr/ktimerdialog.h
 debian/tmp/opt/trinity/include/libkrandr/libkrandr.h
 debian/tmp/opt/trinity/include/libkrandr/lowlevel_randr.h
 debian/tmp/opt/trinity/include/libkrandr/randr.h
+debian/tmp/opt/trinity/include/libkrsync/krsync.h
 debian/tmp/opt/trinity/include/libkmid/alsaout.h
 debian/tmp/opt/trinity/include/libkmid/dattypes.h
 debian/tmp/opt/trinity/include/libkmid/deviceman.h
@@ -799,6 +800,8 @@ debian/tmp/opt/trinity/lib/libkparts.la
 debian/tmp/opt/trinity/lib/libkparts.so
 debian/tmp/opt/trinity/lib/libkrandr.la
 debian/tmp/opt/trinity/lib/libkrandr.so
+debian/tmp/opt/trinity/lib/libkrsync.la
+debian/tmp/opt/trinity/lib/libkrsync.so
 debian/tmp/opt/trinity/lib/libkresources.la
 debian/tmp/opt/trinity/lib/libkresources.so
 debian/tmp/opt/trinity/lib/libkscreensaver.la
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-doc.install b/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-doc.install
new file mode 100644
index 000000000..09f34bbc7
--- /dev/null
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-doc.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdelibs-apidocs/*
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
index d945126bf..6ee941938 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -290,6 +290,8 @@ debian/tmp/opt/trinity/lib/libkparts.so.2
 debian/tmp/opt/trinity/lib/libkparts.so.2.1.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0
 debian/tmp/opt/trinity/lib/libkrandr.so.0.0.95
+debian/tmp/opt/trinity/lib/libkrsync.so.0
+debian/tmp/opt/trinity/lib/libkrsync.so.0.0.1
 debian/tmp/opt/trinity/lib/libkresources.so.1
 debian/tmp/opt/trinity/lib/libkresources.so.1.2.0
 debian/tmp/opt/trinity/lib/libkscreensaver.so.4
diff --git a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
index 888f4be38..271a018a9 100644
--- a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
@@ -96,3 +96,15 @@ clean::
 	rm -f debian/stamp-cvs-make
 
 endif
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules
index 6d8c87f14..07237352d 100755
--- a/ubuntu/maverick/kdepim/debian/rules
+++ b/ubuntu/maverick/kdepim/debian/rules
@@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
+DEB_KDE_APIDOX := yes
+
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
 -DBUILD_ALL="ON" -DBUILD_KITCHENSYNC="ON" \
 -DWITH_ARTS="ON" -DWITH_SASL="ON" -DWITH_NEWDISTRLISTS="ON" -DWITH_GNOKII="OFF" -DWITH_EXCHANGE="ON" -DWITH_EGROUPWARE="ON" -DWITH_KOLAB="ON" -DWITH_SLOX="ON" -DWITH_GROUPWISE="ON" -DWITH_FEATUREPLAN="ON" -DWITH_GROUPDAV="ON" -DWITH_BIRTHDAYS="ON" -DWITH_NEWEXCHANGE="ON" -DWITH_SCALIX="ON" -DWITH_CALDAV="ON" -DWITH_CARDDAV="ON" -DWITH_INDEXLIB="ON"