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

13 years ago · 3604961da7
parent a9a3e888fa aa67f69e3b
commit 3604961da7
79 changed files with 28008 additions and 3990 deletions
--- a/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD
@ -6,8 +6,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Amarok music player "
+groups=('trinity-apps')
+pkgdesc="Trinity Amarok music player and manager"
 depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap' 'ruby')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
@ -0,0 +1,53 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-digikam
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity Photo Management and Retouching Suite"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/digikam-3.5.13.tar.gz)
+md5sums=('81cfcd75dc9c067ba6761aa1147c31e7')
+
+_builddir=applications/digikam
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < digikam.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-dolphin/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-dolphin/PKGBUILD
@ -7,8 +7,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Do3phin file manager"
+groups=('trinity-apps')
+pkgdesc="Trinity Do3phin file manager"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
@ -0,0 +1,53 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-filelight
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity File system Viewer"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/filelight-3.5.13.tar.gz)
+md5sums=('b53cb6b46942e56aa247100cdb84d85f')
+
+_builddir=applications/filelight
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < filelight.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
@ -0,0 +1,53 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-gwenview
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity Image Viewer"
+depends=('trinity-kdelibs' 'trinity-libkexiv2' 'trinity-libkipi')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gwenview-3.5.13.tar.gz)
+md5sums=('3ff9b8c4049dc40f26f89b4be3c21b96')
+
+_builddir=applications/gwenview
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < gwenview.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
@ -0,0 +1,55 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-k3b
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity CD and DVD burning"
+depends=('trinity-kdelibs' 'hal' 'dbus' 'alsa-lib' 'ffmpeg' 'flac' 'libvorbis' 'libmpcdec' 'lame' 'libmad' 'libsndfile' 'libdvdread' 'cdrdao' 'cdrkit' 'transcode' 'dvd+rw-tools' 'emovix' 'sox' 'normalize')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/k3b-3.5.13.tar.gz)
+md5sums=('f022338d361632223106ba444fe1e60e')
+
+_builddir=applications/k3b
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < k3b.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-alsa \
+     --enable-ffmpeg-all-codecs \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kbfx/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kbfx/PKGBUILD
@ -6,8 +6,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Kbfx KDE menu"
+groups=('trinity-apps')
+pkgdesc="Trinity Kbfx KMenu replacement"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-extras/trinity-kbfx/kbfx.patch
+++ b/arch/3.5.13/trinity-extras/trinity-kbfx/kbfx.patch
--- a/arch/3.5.13/trinity-extras/trinity-kdesvn/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdesvn/PKGBUILD
@ -6,8 +6,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - kdesvn kde fontend for svn"
+groups=('trinity-apps')
+pkgdesc="Trinity SVN frontend gui"
 depends=('trinity-kdebase' 'sqlite3' 'subversion')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-extras/trinity-kdesvn/kdesvn.patch
+++ b/arch/3.5.13/trinity-extras/trinity-kdesvn/kdesvn.patch
--- a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
@ -0,0 +1,49 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-konversation
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity Konversation IRC client"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
+md5sums=('0f0e0415dad4c19bc885c9addadf4026')
+
+_builddir=applications/konversation
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  
+  msg "Starting autoconf..."
+  cd "$srcdir/$cmpdir"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure \
+     --with-qt-dir=${QTDIR} \
+     --with-qt-inculdes=${QTDIR}/include \
+     --with-qt-libraries=${QTDIR}/lib \
+     --prefix=${_prefix} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#  cd ${srcdir}/build
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD
@ -6,8 +6,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - kpowersave"
+groups=('trinity-apps')
+pkgdesc="Trinity kpowersave"
 depends=('xscreensaver'
        'libxss'
        'trinity-kdebase')
--- a/arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch
+++ b/arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch
--- a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
@ -0,0 +1,50 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-ktorrent
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-apps')
+pkgdesc="Trinity - pkgdesc"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/ktorrent-3.5.13.tar.gz)
+md5sums=('3bf211ec2a41f92d935e12ee8753fa06')
+
+_builddir=applications/ktorrent
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < ktorrent.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --enable-torrent-mimetype \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
@ -6,7 +6,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
+groups=('trinity-artwork')
 pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE"
 depends=('trinity-kdebase' 'gtk2')
 makedepends=('pkgconfig' 'cmake' 'imake')
--- a/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
@ -0,0 +1,46 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kde-style-lipstik
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-artwork')
+pkgdesc="Trinity - Lipstik style"
+depends=('trinity-kdelibs' 'trinity-kdebase')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
+md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
+
+_builddir=applications/kde-style-lipstik
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  msg "Starting autoconf..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
@ -6,12 +6,13 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Trinity style QtCurve"
+groups=('trinity-artwork')
+pkgdesc="Trinity - QtCurve style"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
 source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz')
+
 _svnmod=applications/kde-style-qtcurve
 md5sums=('98133893b9c6736804d4dfc134a3a256')

--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@ -0,0 +1,90 @@
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+
+pkgname=hal
+pkgver=0.5.14
+pkgrel=6
+pkgdesc="Hardware Abstraction Layer"
+arch=(i686 x86_64)
+license=('GPL' 'custom')
+url="http://www.freedesktop.org/wiki/Software/hal"
+depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16' 'v4l-utils')
+makedepends=('pkgconfig' 'gperf')
+options=('!libtool' '!makeflags')
+install=hal.install
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+         hald
+         hal.patch)
+#        patches/hal-0.5.9-hide-diagnostic.patch
+#        patches/hal-remove-dell-killswitch.patch
+#        patches/hal-KVM-evdev.patch
+#        patches/hal-HDAPS-blacklist.patch
+#        patches/hal-xen-unignore-axes.patch
+#        patches/hal-use-at-console.patch
+#        patches/fix-libusb-detection.patch
+#        patches/dbus-error-init.patch
+#        patches/path-max.patch
+#        patches/handle-input-touchpad.patch
+#        patches/macbook-fix-ioperm.patch
+#        patches/hal-ignore-internal-dm-devices.patch
+
+md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
+         '277e96ac130d7bfce0b30f0b80db8782'
+         '185dd5d6ffc703ec8395b4eb3a1ae498')
+#         '4d4b6801a1cedca22b8bdd9db73b16fb'
+#         '6d87c3e63184ae3a69caafc846f538a3'
+#         '6507e5091ee2d11a87ae738a8e2caecb'
+#         '1171c2d83b76059f2da7a3538e08fa4e'
+#         '52bd305299aa22ae07f1a862c22d30fa'
+#         '3f11234fb5e5044fbfc5199ec65b182c'
+#         'da088f12cfc2d190bbf95b747e19ab9e'
+#         '634f4ec2203eff7de8fa2ed2c6b9cbe0'
+#         'f8c9b3a40d03907b498feef571d42466'
+#         '0575677614db0632b17b1a719798c7e0'
+#         '46a5db3ff896ee37762aa8d7e70942c4'
+#         '17bc2b911f245cef4a1d98769d5c4d14'
+
+build() {
+   cd $srcdir
+  patch -Np1 -d ${srcdir} < videodev.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
+#  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
+#  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
+#  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
+#  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
+#  patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
+#  patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
+#  patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
+#  patch -Np1 -i "${srcdir}/dbus-error-init.patch"
+#  patch -Np1 -i "${srcdir}/path-max.patch"
+#  patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
+#  patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
+#  patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
+  
+  libtoolize --force
+  aclocal
+  autoconf
+  automake
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
+      --enable-static=no --disable-acpi-ibm \
+      --disable-docbook-docs --disable-console-kit \
+      --disable-policy-kit --disable-acl-management \
+      --enable-umount-helper --disable-smbios \
+      --with-hal-user=hal --with-hal-group=hal \
+      --with-pid-file=/var/run/hald.pid \
+      --disable-gtk-doc
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 -d "${pkgdir}/media"
+  install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # Fix udev rule location
+  install -d -m755 "${pkgdir}/lib"
+  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
+}
--- a/arch/3.5.13/trinity-base/hal/hal.install
+++ b/arch/3.5.13/trinity-base/hal/hal.install
@ -0,0 +1,24 @@
+post_install() {
+  getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
+  getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
+  getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
+  getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
+  getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
+  usr/bin/passwd -l hal &>/dev/null
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+# arg 1:  the old package version
+post_remove() {
+  if getent passwd hal &>/dev/null; then
+    usr/sbin/userdel hal
+  fi
+  if getent group hal &>/dev/null; then
+    usr/sbin/groupdel hal
+  fi
+}
--- a/arch/3.5.13/trinity-base/hal/hal.patch
+++ b/arch/3.5.13/trinity-base/hal/hal.patch
--- a/arch/3.5.13/trinity-base/hal/hald
+++ b/arch/3.5.13/trinity-base/hal/hald
@ -0,0 +1,54 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+    start)
+       #Check for running dbus, start when not running
+       ck_daemon dbus && /etc/rc.d/dbus start
+       if [ -x /etc/rc.d/acpid ]; then
+          ck_daemon acpid && /etc/rc.d/acpid start
+       fi
+       stat_busy "Starting Hardware Abstraction Layer"
+       if [ ! -x /var/cache/hald ] ; then
+          install -m755 -g 82 -o 82 -d /var/cache/hald
+       fi
+       if [ ! -x /var/run/hald ]; then
+          install -m755 -g 82 -o 82 -d /var/run/hald
+       fi
+       if [ ! -x /var/run/hald/hald-local ]; then
+          install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
+       fi
+       if [ ! -x /var/run/hald/hald-runner ]; then
+          install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
+       fi
+       /usr/sbin/hald
+       if [ $? -gt 0 ]; then
+          stat_fail
+       else
+          add_daemon hald
+          stat_done
+       fi
+       ;;
+    stop)
+       stat_busy "Stopping Hardware Abstraction Layer"
+       [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
+       if [ $? -gt 0 ]; then
+          stat_fail
+       else
+          rm_daemon hald
+          stat_done
+       fi
+       ;;
+    restart)
+       $0 stop
+       sleep 1
+       $0 start
+       ;;
+    *)
+       echo "usage: $0 {start|stop|restart}"
+       ;;
+esac
+exit 0
--- a/arch/3.5.13/trinity-base/hal/patches/dbus-error-init.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/dbus-error-init.patch
@ -0,0 +1,231 @@
+From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Wed, 30 Dec 2009 11:42:52 +0000
+Subject: linux/probe-input: don't use error prio init
+
+it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is
+called before the error structure is initialized via
+dbus_error_init (&error). This could lead to a segfault during startup
+as seen in dmesg:
+
+|Intel AES-NI instructions are not detected.
+|padlock: VIA PadLock not detected.
+|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000]
+|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000]
+|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000]
+|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000]
+|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000]
+|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000]
+|RPC: Registered udp transport module.
+|RPC: Registered tcp transport module.
+
+What I run into seems to be reported as Debian #562068 [0]. This patch
+makes the segfault go away on my machine.
+
+[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
+index 94e9929..cad47d3 100644
+--- a/hald/linux/probing/probe-input.c
+++ b/hald/linux/probing/probe-input.c
+@@ -70,6 +70,7 @@ main (int argc, char *argv[])
+ 	fd = -1;
+ 
+ 	setup_logger ();
+	dbus_error_init (&error);
+ 
+ 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
+ 	if (button_type == NULL)
+@@ -96,7 +97,6 @@ main (int argc, char *argv[])
+ 	if (udi == NULL)
+ 		goto out;
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+ 
+--
+cgit v0.8.3-6-g21f6
+From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 24 Feb 2010 16:19:28 +0000
+Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR()
+
+If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is
+called on that error, then it is uninitialized and may segfault.  This
+means that dbus_error_init() must be called before any "goto out" if
+"out:" calls LIBHAL_FREE_DBUS_ERROR().
+
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
+index 45d2084..bffc040 100644
+--- a/hald/linux/probing/probe-hiddev.c
+++ b/hald/linux/probing/probe-hiddev.c
+@@ -57,11 +57,12 @@ main (int argc, char *argv[])
+ 	/* assume failure */
+ 	ret = 1;
+ 
+	dbus_error_init (&error);
+
+ 	udi = getenv ("UDI");
+ 	if (udi == NULL)
+ 		goto out;
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+ 
+diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
+index 70b0f86..aaa92e2 100644
+--- a/hald/linux/probing/probe-ieee1394-unit.c
+++ b/hald/linux/probing/probe-ieee1394-unit.c
+@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
+ 
+ 	setup_logger ();
+ 
+	dbus_error_init (&error);
+
+ 	udi = getenv ("UDI");
+ 	if (udi == NULL)
+ 		goto out;
+@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
+ 	if (ieee1394_udi == NULL)
+ 		goto out;
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+ 
+diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
+index 0b1b912..e911eea 100644
+--- a/hald/linux/probing/probe-net-bluetooth.c
+++ b/hald/linux/probing/probe-net-bluetooth.c
+@@ -141,6 +141,8 @@ main (int argc, char *argv[])
+ 	DBusMessage *reply = NULL;
+ 	DBusError error;
+ 
+	dbus_error_init (&error);
+
+ 	udi = getenv ("UDI");
+ 	if (udi == NULL)
+ 		goto out;
+@@ -151,8 +153,6 @@ main (int argc, char *argv[])
+ 
+ 	HAL_INFO (("Investigating '%s'", iface));
+ 
+-	dbus_error_init (&error);
+-
+ 	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
+ 		goto out;
+ 
+diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
+index 91ed7bc..7c6d1c6 100644
+--- a/hald/linux/probing/probe-printer.c
+++ b/hald/linux/probing/probe-printer.c
+@@ -66,6 +66,8 @@ main (int argc, char *argv[])
+ 	ret = 1;
+ 
+ 	setup_logger ();
+
+	dbus_error_init (&error);
+ 	
+ 	udi = getenv ("UDI");
+ 	if (udi == NULL) {
+@@ -73,7 +75,6 @@ main (int argc, char *argv[])
+ 		goto out;
+ 	}
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ 		HAL_ERROR (("ctx init failed"));
+ 		goto out;
+diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
+index 0bc9689..15c0d4f 100644
+--- a/hald/linux/probing/probe-smbios.c
+++ b/hald/linux/probing/probe-smbios.c
+@@ -129,6 +129,8 @@ main (int argc, char *argv[])
+ 	ret = 1;
+ 
+ 	setup_logger ();
+
+	dbus_error_init (&error);
+ 	
+ 	udi = getenv ("UDI");
+ 	if (udi == NULL) {
+@@ -136,7 +138,6 @@ main (int argc, char *argv[])
+ 		goto out;
+ 	}
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ 		HAL_ERROR (("ctx init failed"));
+ 		goto out;
+diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
+index 824a82e..dd524ca 100644
+--- a/hald/linux/probing/probe-storage.c
+++ b/hald/linux/probing/probe-storage.c
+@@ -109,6 +109,8 @@ main (int argc, char *argv[])
+ 	/* assume failure */
+ 	ret = 1;
+ 
+	dbus_error_init (&error);
+
+ 	if ((udi = getenv ("UDI")) == NULL)
+ 		goto out;
+ 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
+@@ -127,7 +129,6 @@ main (int argc, char *argv[])
+ 	else
+ 		only_check_for_fs = FALSE;
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+ 
+diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
+index cf913c0..7bc13e8 100644
+--- a/hald/linux/probing/probe-video4linux.c
+++ b/hald/linux/probing/probe-video4linux.c
+@@ -58,6 +58,8 @@ main (int argc, char *argv[])
+ 
+ 	setup_logger ();
+ 
+	dbus_error_init (&error);
+
+ 	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
+ 	if (device_file == NULL)
+ 		goto out;
+@@ -66,7 +68,6 @@ main (int argc, char *argv[])
+ 	if (udi == NULL)
+ 		goto out;
+ 
+-	dbus_error_init (&error);
+ 	ctx = libhal_ctx_init_direct (&error);
+ 	if (ctx == NULL)
+ 		goto out;
+diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
+index 0de1b91..7268fff 100644
+--- a/hald/linux/probing/probe-volume.c
+++ b/hald/linux/probing/probe-volume.c
+@@ -318,6 +318,8 @@ main (int argc, char *argv[])
+ 	/* assume failure */
+ 	ret = 1;
+ 
+	dbus_error_init (&error);
+
+ 	if ((udi = getenv ("UDI")) == NULL)
+ 		goto out;
+ 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
+@@ -346,7 +348,6 @@ main (int argc, char *argv[])
+ 
+ 	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
+ 
+-	dbus_error_init (&error);
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ 		goto out;
+ 
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch
@ -0,0 +1,66 @@
+From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001
+From: Joe Marcus Clarke <marcus@FreeBSD.org>
+Date: Tue, 08 Dec 2009 00:05:27 +0000
+Subject: Fix libusb detection on Linux
+
+Adjust the FreeBSD libusb20 code so that it does not interfere with the
+Linux libusb detection.
+
+Reported by:	Robby Workman <rw@rlworkman.net>
+---
+diff --git a/configure.in b/configure.in
+index a8fda51..8363595 100644
+--- a/configure.in
+++ b/configure.in
+@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
+ fi 
+ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
+ 
+-USE_LIBUSB20=no
+-USE_LIBUSB=no
+-LIBUSB20_LIBS=""
+ AC_ARG_WITH([backend],
+ 	    AS_HELP_STRING([--with-backend=<name>],
+ 	                   [backend to use (linux/solaris/freebsd/dummy)]),
+@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
+ AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
+ AC_SUBST(HALD_BACKEND)
+ if test "x$HALD_BACKEND" = "xfreebsd"; then
+-    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
+-fi
+-if test "x$USE_LIBUSB20" = "xno"; then
+-    AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
+-fi
+-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
+-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
+-if test "x$USE_LIBUSB20" = "xyes"; then
+-    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
+-    LIBUSB20_LIBS="-lusb20"
+-elif test "x$USE_LIBUSB" = "xyes"; then
+-    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
+-    LIBUSB20_LIBS="-lusb"
+    USE_BSDLIBUSB20=no
+    USE_BSDLIBUSB=no
+    LIBUSB20_LIBS=""
+    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
+    if test "x$USE_BSDLIBUSB20" = "xno"; then
+        AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
+    fi
+    AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
+        LIBUSB20_LIBS="-lusb20"
+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
+        LIBUSB20_LIBS="-lusb"
+    fi
+    AC_SUBST(LIBUSB20_LIBS)
+else
+    AM_CONDITIONAL([HAVE_LIBUSB20], [false])
+ fi
+-AC_SUBST(LIBUSB20_LIBS)
+ 
+ dnl DBUS API is subject to changes
+ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/hal/patches/hal-0.5.9-hide-diagnostic.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-0.5.9-hide-diagnostic.patch
@ -0,0 +1,14 @@
+--- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig	2007-05-01 21:39:31.000000000 +0000
+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi	2007-05-01 21:51:14.000000000 +0000
+@@ -100,6 +100,11 @@
+ 	</match>
+       </match>
+ 
+      <!-- Hide partitions marked as Compaq Diagnostics -->
+      <match key="volume.partition.type" string="0x12">
+        <merge key="volume.ignore" type="bool">true</merge>
+      </match>
+
+       <!-- EFI firmware partitions -->
+       <match key="volume.fstype" string="vfat">
+ 	<match key="volume.label" string="EFI">
--- a/arch/3.5.13/trinity-base/hal/patches/hal-HDAPS-blacklist.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-HDAPS-blacklist.patch
@ -0,0 +1,30 @@
+From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 25 Jun 2009 09:47:27 +1000
+Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X.
+
+This device posts accelerometer data through ABS_X/ABS_Y, making X unusable
+if it's controlling the pointer.
+---
+ fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
+index a342421..89ba672 100644
+--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
+@@ -38,5 +38,11 @@
+         <merge key="input.x11_driver" type="string">evdev</merge>
+       </match>
+     </match>
+
+    <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+         Posts accel data through ABS_X/ABS_Y, makes X unusable -->
+    <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
+        <remove key="input.x11_driver" />
+    </match>
+   </device>
+ </deviceinfo>
+-- 
+1.6.3.rc1.2.g0164.dirty
+
--- a/arch/3.5.13/trinity-base/hal/patches/hal-KVM-evdev.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-KVM-evdev.patch
@ -0,0 +1,36 @@
+From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 20 Mar 2009 14:37:24 +1000
+Subject: [PATCH] Add x11_driver for American Megatrends KVM.
+
+This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick
+assigned but not input.mouse, hence the default evdev mapping doesn't pick up
+on it.
+
+Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ fdi/policy/10osvendor/10-x11-input.fdi |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
+index 769f75b..eb9767e 100644
+--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
+@@ -2,6 +2,12 @@
+ <deviceinfo version="0.2">
+   <device>
+ 
+    <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
+         set by hal and doesn't get picked up by default -->
+    <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
+       <merge key="input.x11_driver" type="string">evdev</merge>
+    </match>
+
+     <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
+     <match key="input.product" contains="QEMU USB Tablet">
+        <merge key="input.x11_driver" type="string">evdev</merge>
+-- 
+1.6.0.6
+
--- a/arch/3.5.13/trinity-base/hal/patches/hal-ignore-internal-dm-devices.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-ignore-internal-dm-devices.patch
@ -0,0 +1,43 @@
+From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001
+From: Milan Broz <mbroz@redhat.com>
+Date: Tue, 13 Jul 2010 14:07:32 +0000
+Subject: HAL: Ignore internal DM devices with new DM udev rules
+
+With new device-mapper udev rules are /dev/mapper/* symlinks
+to basic device name /dev/dm-X.
+(Change requested by udev upstream.)
+
+This change breaks temporary-cryptsetup workaround inside hal.
+
+With new dm-udev rules (uncluded since device-mapper 1.02.39)
+there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
+which controls that scan should be ignored for this device
+(it is set for all internal devices, including temporary cryptsetup,
+internal parts of lvm devices etc.)
+
+Ignore device if this flag is set.
+
+See bugs
+https://bugzilla.redhat.com/show_bug.cgi?id=613909
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
+
+Signed-off-by: Milan Broz <mbroz@redhat.com>
+---
+diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
+index a8233fd..6d616bc 100644
+--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
+@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
+ 				g_free (str);
+ 			}
+ 			g_free (dstr);
+		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
+			if (strtoul(&key[33], NULL, 10) == 1) {
+				HAL_INFO (("ignoring device requested by DM udev rules"));
+				goto invalid;
+			}
+ 		}
+ 	}
+ 
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/hal/patches/hal-remove-dell-killswitch.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-remove-dell-killswitch.patch
@ -0,0 +1,201 @@
+diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux
+--- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux	2008-08-22 07:34:47.000000000 +0100
+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux	2009-03-03 10:45:20.000000000 +0000
+@@ -8,11 +8,6 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ 
+-DELL_WCTL=/usr/bin/dellWirelessCtl
+-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
+-  DELL_WCTL=/usr/sbin/dellWirelessCtl
+-fi
+-
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ 	value="`hal-system-sonypic getbluetooth`"
+@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
+ 	    exit 1
+ 	fi
+ 	exit ${value}
+-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+-	if [ -x "$DELL_WCTL" ]; then
+-	    # TODO: write our own binary that links with libsmbios?
+-	    $DELL_WCTL --st_bt
+-	    value=$?
+-	    if [ "$value" = "0" ]; then
+-	        exit 1
+-	    elif [ "$value" = "1" ]; then
+-	        exit 0
+-	    else
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $value" >&2
+-                exit 1
+-	    fi
+-        else
+-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-	    exit 1
+-	fi
+     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
+ 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
+ 	if [ $? -eq 0 ]; then
+@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
+ 	echo "Access type not supported" >&2
+ 	exit 1
+     fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+-	if [ -x "$DELL_WCTL" ]; then
+- 	    # TODO: write our own binary that links with libsmbios?
+-	    $DELL_WCTL --st_wlan
+-	    value=$?
+-	    if [ "$value" = "0" ]; then
+-	        exit 1
+-	    elif [ "$value" = "1" ]; then
+-	        exit 0
+-	    else
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $value" >&2
+-                exit 1
+-	    fi
+-	else 
+-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-	    exit 1
+-	fi
+-    else
+-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	echo "Access type not supported" >&2
+-	exit 1
+-    fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+-	if [ -x "$DELL_WCTL" ]; then
+-   	    # TODO: write our own binary that links with libsmbios?
+-	    $DELL_WCTL --st_wwan
+-	    value=$?
+-	    if [ "$value" = "0" ]; then
+-	        exit 1
+-	    elif [ "$value" = "1" ]; then
+-	        exit 0
+-	    else
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $value" >&2
+-                exit 1
+-	    fi
+-	else 
+-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-	    exit 1
+-	fi
+-    else
+-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	echo "Access type not supported" >&2
+-	exit 1
+-    fi
+ else
+     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+     echo "Killswitch type not supported" >&2
+diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux
+--- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux	2008-10-24 09:45:54.000000000 +0100
+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux	2009-03-03 10:44:49.000000000 +0000
+@@ -8,11 +8,6 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ 
+-DELL_WCTL=/usr/bin/dellWirelessCtl
+-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
+-    DELL_WCTL=/usr/sbin/dellWirelessCtl
+-fi
+-
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ 	hal-system-sonypic setbluetooth $value
+@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
+ 	    exit 1
+ 	fi
+ 	exit 0
+-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+-	if [ -x "$DELL_WCTL" ]; then
+-	    # TODO: write our own binary that links with libsmbios?
+-	    if [ "$value" = "true" ]; then
+-	        $DELL_WCTL --bt 1
+-	        ret=$?
+-	    else
+-	        $DELL_WCTL --bt 0
+-	        ret=$?
+-	    fi
+-	    if [ "$ret" != "0" ]; then
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $ret" >&2
+-	        exit 1
+-	    fi
+-        else
+-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-            exit 1
+-        fi
+     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
+         if [ "$value" = "true" ]; then 
+ 	    bit=1; 
+@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
+ 	echo "Access type not supported" >&2
+ 	exit 1
+     fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+-	if [ -x "$DELL_WCTL" ]; then
+-	    # As a side effect we disable the physical kill switch
+-	    # TODO: write our own binary that links with libsmbios?
+-	    if [ "$value" = "true" ]; then
+-	        $DELL_WCTL --sw_wlan 0 --wlan 1
+-	        ret=$?
+-	    else
+-	        $DELL_WCTL --sw_wlan 0 --wlan 0
+-	        ret=$?
+-	    fi
+-	    if [ "$ret" != "0" ]; then
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $ret" >&2
+-                exit 1
+-	    fi
+-        else
+-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-            exit 1
+-        fi
+-    else
+-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	echo "Access type not supported" >&2
+-	exit 1
+-    fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
+-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
+-	if [ -x "$DELL_WCTL" ]; then
+-	    # As a side effect we disable the physical kill switch
+-	    # TODO: write our own binary that links with libsmbios?
+-	    if [ "$value" = "true" ]; then
+-	        $DELL_WCTL --sw_wwan 0 --wwan 1
+-	        ret=$?
+-	    else
+-	        $DELL_WCTL --sw_wwan 0 --wwan 0
+-	        ret=$?
+-	    fi
+-	    if [ "$ret" != "0" ]; then
+-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	        echo "dellWirelessCtl returned $ret" >&2
+-                exit 1
+-	    fi
+-        else
+-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+-            exit 1
+-        fi
+-    else
+-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+-	echo "Access type not supported" >&2
+-	exit 1
+-    fi
+ else
+     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+     echo "Killswitch type not supported" >&2
--- a/arch/3.5.13/trinity-base/hal/patches/hal-use-at-console.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-use-at-console.patch
@ -0,0 +1,45 @@
+diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in
+--- hal-0.5.13/hal.conf.in.drop-polkit	2009-02-04 17:07:23.000000000 -0500
+++ hal-0.5.13/hal.conf.in	2009-07-29 23:15:16.866766074 -0400
+@@ -25,7 +25,41 @@
+            send_interface="org.freedesktop.Hal.Device"/>
+     <allow send_destination="org.freedesktop.Hal"
+            send_interface="org.freedesktop.Hal.Manager"/>
+  </policy>
+
+  <!-- Only allow users at the local console to manipulate devices -->
+  <policy at_console="true">
+    <allow send_destination="org.freedesktop.Hal"
+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+    <allow send_destination="org.freedesktop.Hal"
+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
+
+  </policy>
+ 
+  <!-- well,...and root too -->
+  <policy user="root">
+     <allow send_destination="org.freedesktop.Hal"
+            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
+     <allow send_destination="org.freedesktop.Hal"
--- a/arch/3.5.13/trinity-base/hal/patches/hal-xen-unignore-axes.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/hal-xen-unignore-axes.patch
@ -0,0 +1,39 @@
+From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 19 Oct 2009 14:27:20 +1000
+Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer.
+
+The evdev-internal axis type picking fails for the Xen Virtual Pointer as it
+exposes both relative and absolute axes. Evdev picks the relative axes by
+default, leading to a immovable pointer if the Xen backend only sends
+absolute coordinates.
+
+Explicitly tell evdev to not ignore the absolute axes.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=523914
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ fdi/policy/10osvendor/10-x11-input.fdi |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
+index 89ba672..752c4ab 100644
+--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
+@@ -44,5 +44,12 @@
+     <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
+         <remove key="input.x11_driver" />
+     </match>
+
+    <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
+         Mouse does not move in PV Xen guest -->
+    <match key="info.product" contains="Xen Virtual Pointer">
+      <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
+      <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
+    </match>
+   </device>
+ </deviceinfo>
+-- 
+1.6.2.5
+
--- a/arch/3.5.13/trinity-base/hal/patches/handle-input-touchpad.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/handle-input-touchpad.patch
@ -0,0 +1,101 @@
+From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001
+From: Michael Witten <mfwitten@gmail.com>
+Date: Wed, 06 Jan 2010 00:53:17 +0000
+Subject: Policy: handle `input.touchpad' explicitly
+
+This commit essentially duplicates the policy for:
+
+   <match key="info.capabilities" contains="input.mouse">
+
+and then changes `input.mouse' to `input.touchpad'. This
+is necessary because in Linus Torvalds's Linux repo:
+
+    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+
+the following commit:
+
+    commit 7105d2ea73e1391b681d0e1212c42f561c64d429
+    Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+    Date:   Fri Dec 11 23:54:54 2009 -0800
+
+        Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
+
+        Relative events are only reported via secondary device therefore device
+        associated with the touchpad should not advertise these capabilities.
+
+        Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+
+made these few changes:
+
+    diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
+    index a3f492a..b03e7e0 100644
+    /--- a/drivers/input/mouse/alps.c
+    /+++ b/drivers/input/mouse/alps.c
+    /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse)
+     	if (alps_hw_init(psmouse))
+     		goto init_fail;
+
+    +	/*
+    +	 * Undo part of setup done for us by psmouse core since touchpad
+    +	 * is not a relative device.
+    +	 */
+    +	__clear_bit(EV_REL, dev1->evbit);
+    +	__clear_bit(REL_X, dev1->relbit);
+    +	__clear_bit(REL_Y, dev1->relbit);
+    +
+    +	/*
+    +	 * Now set up our capabilities.
+    +	 */
+     	dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
+     	dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
+     	dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
+
+so that HAL no longer adds:
+
+    input.mouse
+
+to an ALPS touchpad's:
+
+    info.capabilities
+
+so that HAL no longer marks the ALPS touchpad with:
+
+    input.x11_driver = 'evdev'
+
+because the policy file:
+
+    fdi/policy/10osvendor/10-x11-input.fdi
+
+doesn't define the policy for:
+
+    <match key="info.capabilities" contains="input.touchpad">
+
+which was previous unnecessary because everything used to
+be caught by the policy for:
+
+    <match key="info.capabilities" contains="input.mouse">
+
+Signed-off-by: Michael Witten <mfwitten@gmail.com>
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
+index cff8fc5..8bbe263 100644
+--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
+@@ -16,6 +16,14 @@
+       </match>
+     </match>
+ 
+    <match key="info.capabilities" contains="input.touchpad">
+      <merge key="input.x11_driver" type="string">mouse</merge>
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="Linux">
+        <merge key="input.x11_driver" type="string">evdev</merge>
+      </match>
+    </match>
+
+     <match key="info.capabilities" contains="input.tablet">
+       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+              string="Linux">
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch
@ -0,0 +1,41 @@
+From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Date: Thu, 25 Feb 2010 10:25:18 +0000
+Subject: Fix incorrect arguments to ioperm() call
+
+The second argument of ioperm() is not the last port to be accessed
+but rather length of the port range [port, port + len).
+
+Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
+index e869192..54e4ea3 100644
+--- a/hald/linux/addons/addon-imac-backlight.c
+++ b/hald/linux/addons/addon-imac-backlight.c
+@@ -158,7 +158,8 @@ main (int argc, char **argv)
+ 		goto out;
+ 	}
+ 
+-	if (ioperm(0xB2, 0xB3, 1) < 0)
+	/* Allow access to ports 0xB2 and 0xB3 */
+	if (ioperm(0xB2, 2, 1) < 0)
+ 	{
+ 		HAL_ERROR (("ioperm failed (you should be root)."));
+ 		exit(1);
+diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
+index 2a6fef6..c1bbbac 100644
+--- a/hald/linux/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
+@@ -507,7 +507,8 @@ main (int argc, char *argv[])
+  	state = INREG(0x7ae4);
+  	OUTREG(0x7ae4, state);
+ 
+-	if (ioperm (0x300, 0x304, 1) < 0) {
+	/* Allow access to porta 0x300 through 0x304 */
+	if (ioperm (0x300, 5, 1) < 0) {
+ 		HAL_ERROR (("ioperm failed (you should be root)."));
+ 		exit(1);
+ 	}
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/hal/patches/path-max.patch
+++ b/arch/3.5.13/trinity-base/hal/patches/path-max.patch
@ -0,0 +1,31 @@
+From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Mon, 04 Jan 2010 15:56:13 +0000
+Subject: Bump HAL_PATH_MAX to 4096
+
+Some bits in the code use realpath() with destination paths of size
+HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than
+HAL_PATH_MAX (which was 512 until now).
+
+Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which
+apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on
+Linux), to avoid potential buffer overflows and also fix hal on Linux when
+enabling FORTIFY in gcc.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=25888
+---
+diff --git a/hald/util.h b/hald/util.h
+index c2a1584..7883333 100644
+--- a/hald/util.h
+++ b/hald/util.h
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ #define HAL_NAME_MAX 256
+-#define HAL_PATH_MAX 512
+#define HAL_PATH_MAX 4096
+ 
+ gboolean hal_util_remove_trailing_slash (gchar *path);
+ 
+--
+cgit v0.8.3-6-g21f6
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@ -7,13 +7,13 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - arts"
+pkgdesc="Trinity arts Sound System and libraries"
 depends=('audiofile'
-        'alsa-lib'
-        'libmad'
-	'libvorbis'
-	'trinity-tqtinterface')
-makedepends=('pkgconfig' 'cmake' 'autoconf')
+         'alsa-lib'
+         'libmad'
+         'libvorbis'
+         'trinity-tqtinterface')
+makedepends=('pkgconfig' 'cmake')
 provides=('trinity-arts')
 conflicts=('trinity-arts')
 replaces=('trinity-arts')
@ -22,26 +22,25 @@ source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/ar
 md5sums=('109124dabb1aaa9d44eb32e43b549142')

 # set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
-_qtdir=/opt/qt
-_prefix=${_qtdir}
+#_qtdir=/opt/qt
+_builddir=build
+_prefix="/opt/trinity"

 build() {


  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  #if [[ -r /etc/profile.d/qt3.sh ]]; then
    . /etc/profile.d/qt3.sh
-    [[ -n $QTDIR ]] && _qtdir=$QTDIR
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi

  # exports not required with /opt/qt/include in the right place
  # export CMAKE_PREFIX_PATH=$QTDIR
  # export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt

-  trinity_prefix="/opt/trinity"
-
  cd $srcdir
  msg "Creating out-of-source build directory: ${srcdir}/build"
  mkdir -p build
@ -49,13 +48,13 @@ build() {

  msg "Starting cmake..."
  cmake ${srcdir}/dependencies/arts/ \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
    -DQT_VERSION=3 || return 1

 #     -DQT_VERSION=3 \
 #     -DWITH_QT3=ON \
 #     -DQT_LIBRARY_DIRS=/opt/qt/lib
-
+  msg "Building $pkgname..."
  make VERBOSE=1

 }
--- a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
@ -4,11 +4,10 @@ pkgname=trinity-dbus-1-qt3
 pkgver=0.9
 pkgrel=8
 arch=('i686' 'x86_64')
-pkgdesc="Trinity D-Bus/Qt3 bindings."
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - dbus-1-qt3"
+pkgdesc="Trinity D-Bus/Qt3 bindings."
 depends=('dbus' 'trinity-qt3' 'networkmanager')
 provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
 conflicts=('dbus-1-qt3')
@ -18,13 +17,20 @@ source=(http://people.freedesktop.org/~krake/dbus-1-qt3/${pkgname#*trinity-}-${p
 md5sums=('8ca3d13c372126aa9b0e16beb0a9d82d')

 build() {
-    cd $srcdir/${pkgname#*trinity-}-$pkgver
+   cd $srcdir/${pkgname#*trinity-}-$pkgver
+   msg "Setting enviroment variables..."
+   . /etc/profile.d/qt3.sh
+   msg "Starting configure..."
+   ./configure --prefix=$QTDIR
+   msg "Building #{pkgname}..."
+   make || return 1

-    . /etc/profile.d/qt3.sh
-    ./configure --prefix=$QTDIR
-    make || return 1
-    make DESTDIR="$pkgdir/" install
+   # Libtool slay
+   #     find $startdir/pkg -name *.la -exec rm {} \;
+}

-    # Libtool slay
-#     find $startdir/pkg -name *.la -exec rm {} \;
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd $srcdir/${pkgname#*trinity-}-$pkgver
+   make DESTDIR="${pkgdir}" install
 }
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
@ -1,3 +1,5 @@
+# Maintainer: calvin Morrison <mutantturkey@gmail.com>
+
 pkgname=trinity-dbus-tqt-1
 pkgver=3513
 pkgrel=1
@ -5,46 +7,46 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - D-Bus TQtInterface Wrapper"
+pkgdesc="Trinity D-Bus TQtInterface Wrapper"
 depends=('trinity-tqtinterface' 'dbus')
 provides=('trinity-dbus-tqt-1' 'dbus-tqt-1' 'dbus-1-tqt' 'trinity-dbus-1-tqt')
 makedepends=('pkgconfig' 'cmake')
 options=('libtool' '!strip')
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
 md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
-_svnmod=dependencies/dbus-1-tqt

-_qtdir=/opt/qt
+_svnmod=dependencies/dbus-1-tqt
+_builddir=build
 _prefix="/opt/trinity"

-
 build() {

  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  # if [[ -r /etc/profile.d/qt3.sh ]]; then
    . /etc/profile.d/qt3.sh
-    [[ -n $QTDIR ]] && _qtdir=$QTDIR
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
-/usr/include/dbus-1.0:\
-/opt/trinity/include:\
-/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
+  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\
+     /usr/include/dbus-1.0:\
+     ${_prefix}/include:\
+     ${_prefix}/include/libkrandr
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig

  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+  mkdir -p ${_builddir}
+  cd ${_builddir}

  msg "Starting cmake..."
  cmake ${srcdir}/${_svnmod} \
    -DCMAKE_INSTALL_PREFIX=${_prefix} \
    -DCMAKE_VERBOSE_MAKEFILE=ON 
+
+  msg "Building - $pkgname..."
  make
 #     -DWITH_QT3=ON \
 #     -DQTDIR=/opt/qt \
@ -54,9 +56,6 @@ build() {
 package() {
  msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-  cd ${startdir}
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity TQt Dbus wrapper"
+pkgdesc="Trinity TQt DBus wrapper"
 depends=('trinity-tqtinterface')
 makedepends=('pkgconfig' 'cmake')
 provides=('trinity-dbus-tqt')
@ -17,51 +17,47 @@ options=('libtool' '!strip')
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')

-
 _svnmod=dependencies/dbus-tqt
-_qtdir=/opt/qt
+_builddir=build
 _prefix="/opt/trinity"

-
 build() {

  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  #if [[ -r /etc/profile.d/qt3.sh ]]; then
    . /etc/profile.d/qt3.sh
-    [[ -n $QTDIR ]] && _qtdir=$QTDIR
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
-/usr/include/dbus-1.0:\
-/opt/trinity/include:\
-/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
+  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\
+     /usr/include/dbus-1.0:\
+     ${_prefix}/include:\
+     ${_prefix}/include/libkrandr
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig

  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+  mkdir -p ${_builddir}
+  cd ${_builddir}

  msg "Starting cmake..."
  cmake ${srcdir}/${_svnmod} \
    -DCMAKE_INSTALL_PREFIX=${_prefix} \
    -DCMAKE_VERBOSE_MAKEFILE=ON 
-  make
 #     -DWITH_QT3=ON \
 #     -DQTDIR=/opt/qt \
 #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+
+  msg "Building - $pkgname..."
+  make
 }

 package() {
  msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-  cd ${startdir}
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - kdebase"
+pkgdesc="Trinity Desktop Enviroment base components"
 depends=('hal'
         'libltdl'
         'trinity-dbus-1-qt3'
@ -35,7 +35,7 @@ options=('libtool' '!strip')
 source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
         'c9ce810c281002440a6de8cfd8735d07'
-         '523838d16b38fc62445863ca762c17f8')
+         '376d85d213cf3c04cb0912e5cccd68bd')

 _qtdir=/opt/qt
 _prefix="/opt/trinity"
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@ -7,15 +7,8 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - kdelibs, core libraries"
-depends=('libical'
-         'libxslt'
-         'libltdl'
-         'avahi'
-         'pam-krb5'
-         'taglib'
-         'libxcomposite'
-         'trinity-arts')
+pkgdesc="Trinity DE core libraries"
+depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite')
 makedepends=('pkgconfig' 'cmake' 'autoconf' )
 provides=('trinity-kdelibs' 'kdelibs3')
 conflicts=('trinity-kdelibs' 'kdelibs3')
@ -25,52 +18,53 @@ source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13
 md5sums=('f62eefb63b4ba2141b4c576f859806dd'
         '2de1886d632c8bc288befada5e1bc3b5')

-qtdir=/opt/qt
-trinity_prefix="/opt/trinity"
+_builddir=build
+_prefix="/opt/trinity"

 build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   #if [[ -r /etc/profile.d/qt3.sh ]]; then
    . /etc/profile.d/qt3.sh
-    [[ -n $QTDIR ]] && _qtdir=$QTDIR
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export PATH=$PATH:$trinity_prefix/bin
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/bin
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/qt/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+   # [[ -n $QTDIR ]] && _qtdir=$QTDIR
+   #else
+   # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+   #fi
+   export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+   export PATH=$PATH:${_prefix}/bin
+   export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/bin
+   export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH

-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${_builddir}
+   cd ${_builddir}

-  msg "Starting cmake..."
-  cmake ${srcdir}/kdelibs \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+   msg "Starting cmake..."
+   cmake ${srcdir}/kdelibs \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
    -DCMAKE_VERBOSE_MAKEFILE=OFF \
    -DQT_VERSION=3 \
    -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DQTDIR=${QTDIR} \
+    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
    -DWITH_PAM=ON \
    -DBUILD_ALL=ON
-  make
+
+   msg "Building - $pkgname..."
+   make
 }

 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build

-  make DESTDIR="$pkgdir/" install
+   make DESTDIR="$pkgdir" install

-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  echo "${trinity_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+   echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf

-  install -d -m755 ${pkgdir}/etc/profile.d/
-  install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/
+   install -d -m755 ${pkgdir}/etc/profile.d/
+   install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/

-#   rm -r ${srcdir}/${_svnmod}
+   #   rm -r ${srcdir}/${_svnmod}
 }
--- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
@ -3,31 +3,37 @@
 pkgname=trinity-pyqt3
 pkgver=3.18.1
 pkgrel=1
-pkgdesc="A set of Python bindings for the Qt3 toolkit"
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/pyqt/intro"
+license=('GPL')
 groups=('trinity-base')
+pkgdesc="Trinity set of Python bindings for the Qt3 toolkit"
 depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3')
-license=('GPL')
+#makedepends=()
+#optdepends=()
 provides=('trinity-pyqt3' 'pyqt3')
 conflicts=('pyqt3')
 replaces=('trinity-pyqt3')
+#options=()
 source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
 md5sums=('f1d120495d1aaf393819e988c0a7bb7e')

 build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+   cd ${srcdir}/PyQt-x11-gpl-${pkgver}

-  . /etc/profile.d/qt3.sh
+   msg "Starting configure..."
+   . /etc/profile.d/qt3.sh

-  export QMAKESPEC="/opt/qt/mkspecs/default"
+   export QMAKESPEC="/opt/qt/mkspecs/default"

-  echo yes | python2.7 configure.py -q /opt/qt/
+   echo yes | python2.7 configure.py -q /opt/qt/

-  make
+   msg "Building ${pkgname}..."
+   make
 }

 package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+   make DESTDIR=${pkgdir} install
 }
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@ -1,74 +1,78 @@
 # Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
+
 pkgname=trinity-qt3
 pkgver=3884
 pkgrel=2
-pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
-_prefix="/opt/qt"
 arch=('i686' 'x86_64')
-license=('GPL')
 url="http://trinitydesktop.org"
-# install=qt.install
+license=('GPL')
 groups=('trinity-base')
+pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
 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/qt"
+options=(!libtool)
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
 md5sums=('78dc675e84aed595375449818cbb589a')
-options=(!libtool)
+
+_prefix="/opt/qt"
+_builddir="qt3"
+# install=qt.install

 build() {
- export QTDIR="${srcdir}/qt3/" 
- export PATH=${QTDIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
- export QMAKESPEC=$QTDIR/mkspecs/linux-g++
- 
- if [ "$CARCH" = "x86_64" ]; then
+   msg "Setting enviroment variables..."
+   export QTDIR="${srcdir}/${_builddir}/" 
+   export PATH=${QTDIR}/bin:${PATH}
+   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
+   if [ "$CARCH" = "x86_64" ]; then
     export ARCH="-64"
     else unset ARCH
-fi
+   fi

-  cd "${srcdir}/qt3"
+   cd "${srcdir}/${_builddir}"

-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+   rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}

-  msg "Starting configure..."
-  #make -C qmake || return 1
- ./configure    -prefix ${_prefix} \
-                -fast \
-                -sysconfdir /etc/qt \
-                -thread \
-                -shared \
-                -system-zlib \
-                -platform linux-g++$ARCH \
-                -system-lib{png,jpeg,mng} 
-  make  
+   msg "Starting configure..."
+   #make -C qmake || return 1
+   ./configure \
+      -prefix ${_prefix} \
+      -fast \
+      -sysconfdir /etc/qt \
+      -thread \
+      -shared \
+      -system-zlib \
+      -platform linux-g++$ARCH \
+      -system-lib{png,jpeg,mng} \
+      -qt-gif \
+      -cups

+   msg "Building - $pkgname..."
+   make  
 }

-package() {
-  
-  cd "$srcdir/qt3"
-
-  # Build ld.so.conf file
-  echo "/${_prefix}" > ${srcdir}/libqt-mt.conf
-  echo "/${_prefix}/lib" >> ${srcdir}/libqt-mt.conf
-  echo "/opt/trinity/lib" >> ${srcdir}/libqt-mt.conf
-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  install -D -m755 ${srcdir}/libqt-mt.conf  ${pkgdir}/etc/ld.so.conf.d/libqt-mt.conf
+package() {  
+   msg "Packaging - $pkgname-$pkgver"
+   cd "$srcdir/${_builddir}"

-  # 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
-  
+   # Build ld.so.conf file
+   echo "${_prefix}" > ${srcdir}/libqt-mt.conf
+   echo "${_prefix}/lib" >> ${srcdir}/libqt-mt.conf
+   echo "/opt/trinity/lib" >> ${srcdir}/libqt-mt.conf
+   # install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+   install -D -m755 ${srcdir}/libqt-mt.conf  ${pkgdir}/etc/ld.so.conf.d/libqt-mt.conf

-  make INSTALL_ROOT="$pkgdir/" install
+   # 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

+   make INSTALL_ROOT="$pkgdir" install
 } 
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@ -7,65 +7,53 @@ arch=('i686' 'x86_64')
 url="http://trinity.pearsoncomputing.net"
 license=('GPL2')
 groups=('trinity-base')
-pkgdesc="Trinity - tqtinterface"
-depends=('python2-sip'
-	'trinity-qt3'
-	'trinity-pyqt3')
-makedepends=(
-             'pkgconfig'
-             'cmake'
-             'autoconf'
-             'libxi'
-             'libxft'
-             'libxrandr'
-             'libxcursor'
-             'libxinerama'
-             'mesa')
-provides=('trinity-tqtinterface')
-conflicts=('trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+pkgdesc="Trinity - TQt interface"
+depends=('python2-sip' 'trinity-qt3' 'trinity-pyqt3')
+makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libxinerama' 'mesa')
+# optdepends=()
+provides=($pkgname)
+#conflicts=()
+#replaces=()
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
 md5sums=('d54cc9fd0b35555298efd17c32471a2b')

-_qtdir=/opt/qt
 _prefix=/usr
+_builddir=build

 build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
-    . /etc/profile.d/qt3.sh
-  else
-    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
-  fi
-
-  echo $PATH 
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake "../dependencies/tqtinterface" -DCMAKE_INSTALL_PREFIX=${_prefix} -DQT_PREFIX_DIR=/opt/qt/ -DQT_LIBRARY_DIRS=/opt/qt/lib -DQT_INCLUDE_DIR=/opt/qt/include -DQT_VERSION=3 -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
-#     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
-#     -DWITH_QT3=ON \
-#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
-#     -DCMAKE_SKIP_RPATH=ON || return 1
-  make
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   . /etc/profile.d/qt3.sh
+
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake "../dependencies/tqtinterface" \
+     -DCMAKE_INSTALL_PREFIX=${_prefix} \
+     -DQT_PREFIX_DIR=${_qtdir} \
+     -DQT_INCLUDE_DIR=${_qtdir}/include \
+     -DQT_VERSION=3 \
+     -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
+   #     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
+   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+   #     -DWITH_QT3=ON \
+   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+   #     -DCMAKE_SKIP_RPATH=ON || return 1
+   make
 }

 package() {
+   msg "Packaging - $pkgname-$pkgver"
+   #   cd ${_svnmod}
+   cd ${srcdir}/${_builddir}
+   make DESTDIR="${pkgdir}" install

-  msg "Packaging - $pkgname-$pkgver"
-
-#   cd ${_svnmod}
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-
-  # include uic-tqt in package
-#   cd ${srcdir}
-#   mkdir -p ${pkgdir}/usr/bin
-#   cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
+   # include uic-tqt in package
+   #   cd ${srcdir}
+   #   mkdir -p ${pkgdir}/usr/bin
+   #   cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin

-#   rm -r ${srcdir}/${_svnmod}
+   #   rm -r ${srcdir}/${_svnmod}
 }
--- a/arch/3.5.13/trinity-extras/trinity-kde-i18n/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kde-i18n/PKGBUILD
@ -0,0 +1,567 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 
+         'trinity-i18n-be' 'trinity-i18n-bg' 'trinity-i18n-bn' 
+         'trinity-i18n-br' 'trinity-i18n-bs' 'trinity-i18n-ca' 
+         'trinity-i18n-cs' 'trinity-i18n-csb' 'trinity-i18n-cy' 
+         'trinity-i18n-da' 'trinity-i18n-de' 'trinity-i18n-el' 
+         'trinity-i18n-en_gb' 'trinity-i18n-eo' 'trinity-i18n-es' 
+         'trinity-i18n-et' 'trinity-i18n-eu' 'trinity-i18n-fa' 
+         'trinity-i18n-fi' 'trinity-i18n-fr' 'trinity-i18n-fy' 
+         'trinity-i18n-ga' 'trinity-i18n-gl' 'trinity-i18n-he' 
+         'trinity-i18n-hi' 'trinity-i18n-hr' 'trinity-i18n-hu' 
+         'trinity-i18n-is' 'trinity-i18n-it' 'trinity-i18n-ja' 
+         'trinity-i18n-kk' 'trinity-i18n-km' 'trinity-i18n-ko' 
+         'trinity-i18n-lt' 'trinity-i18n-lv' 'trinity-i18n-mk' 
+         'trinity-i18n-mn' 'trinity-i18n-ms' 'trinity-i18n-nb' 
+         'trinity-i18n-nds' 'trinity-i18n-nl' 'trinity-i18n-nn' 
+         'trinity-i18n-pa' 'trinity-i18n-pl' 'trinity-i18n-pt' 
+         'trinity-i18n-pt_br' 'trinity-i18n-ro' 'trinity-i18n-ru' 
+         'trinity-i18n-rw' 'trinity-i18n-se' 'trinity-i18n-sk' 
+         'trinity-i18n-sl' 'trinity-i18n-sr' 'trinity-i18n-sr-latn' 
+         'trinity-i18n-ss' 'trinity-i18n-sv' 'trinity-i18n-ta' 
+         'trinity-i18n-te' 'trinity-i18n-tg' 'trinity-i18n-th' 
+         'trinity-i18n-tr' 'trinity-i18n-uk' 'trinity-i18n-uz' 
+         'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' '
+         trinity-i18n-zh_cn' 'trinity-i18n-zh_tw')
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-i18n')
+pkgdesc="Trinity Localizations collection"
+depends=('trinity-kdelibs' 'trinity-kdebase')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
+md5sums=('7c919c7cb85f454fed46767082a87773')
+
+_builddir=kde-i18n
+_prefix=/opt/trinity
+
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  cd $srcdir/kde-i18n
+  rm HOW.TO.BUILD TRINITY.RELEASE
+
+  for filename in *; do
+     
+     msg "Extracting $filename..."
+     tar xfj $filename
+     
+     dir=`echo "$filename" | cut -d'.' -f1-3`
+     cd $dir
+     
+     msg "Starting $dir configure..."
+     ./configure --prefix=${_prefix} > /dev/null
+     
+     msg "Building $dir..."
+     make > /dev/null
+     
+     cd ..
+     newname=`echo "$dir" | cut -d'-' -f2-4`
+     mv $dir trinity-${newname}
+  done
+}
+
+package_trinity-i18n-af() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Afrikaans localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ar() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Arabic localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-az() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Azerbaijani localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-be() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Belgian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-bg() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Bulgarian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-bn() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Brumei localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-br() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Breton localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-bs() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Bosnian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ca() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Catalan localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-cs() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Czech localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-csb() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Kashubian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-cy() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Cyprus localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-da() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Danish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-de() {
+groups=('trinity-i18n')
+pkgdesc="Trinity German localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-el() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Greek localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-en_gb() {
+groups=('trinity-i18n')
+pkgdesc="Trinity British English localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-en_GB-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-eo() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Esperanto localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-es() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Spanish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-et() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Estonian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-eu() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Basque localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-fa() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Farsi localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-fi() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Finnish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-fr() {
+groups=('trinity-i18n')
+pkgdesc="Trinity French localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-fy() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Frisian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ga() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Irish Galeic localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-gl() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Galician localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-he() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Hebrew localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-hi() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Hindi localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-hr() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Croatian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-hu() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Hungarian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-is() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Icelandic localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-it() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Italian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ja() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Japanese localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-kk() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Kazakh localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-km() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Khmer localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ko() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Korean localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-lt() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Lithuanian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-lv() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Latvian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-mk() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Macedonian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-mn() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Mongolian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ms() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Malay localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-nb() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Norvegian Bokmal localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-nds() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Low Saxon localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-nl() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Dutch localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-nn() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Norvegian Nynorsk localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-pa() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Panjabi/Punjabi localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-pl() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Polish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-pt() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Portoghese localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-pt_br() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Brazilian Porthogese localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-pt_BR-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ro() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Romanian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ru() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Russian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-rw() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Kinyarwanda localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-se() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Northern Sami localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-sk() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Slovak localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-sl() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Slovenian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-sr() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Serbian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-sr-latn() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Serbian latin charset localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-sr@Latn-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ss() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Swati localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-sv() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Swedish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-ta() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Tamil localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-te() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Telgu localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-tg() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Tajik localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-th() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Thai localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-tr() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Turkish localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-uk() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Ukrainian localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-uz() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Uzbek localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-uz-cyrillic() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Uzbek cyrillic charset localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-uz@cyrillic-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-vi() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Vietnamese localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-wa() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Walloon localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-zh_cn() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Chinese Simplified localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-zh_CN-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+package_trinity-i18n-zh_tw() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Chinese Traditional localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/trinity-i18n-zh_TW-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
@ -0,0 +1,59 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdeaccessibility
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity accessibility tools"
+
+depends=('trinity-kdelibs' 'trinity-arts')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+
+provides=($pkgname)
+conflicts=()
+replaces=()
+
+options=('libtool' '!strip')
+
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz)
+md5sums=('ce31b01c1831046fb28aab172f2423bf')
+
+_builddir=kdeaccessibility
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdeaccessibility.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-alsa \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
@ -0,0 +1,55 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdeaddons
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity DE addons collection"
+depends=('trinity-kdelibs' 'trinity-kdebase' 'xmms')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
+md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
+
+_builddir=kdeaddons
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdeaddons.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-{sdl,xmms} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
@ -0,0 +1,55 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdeadmin
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity system administration utils"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz)
+md5sums=('b8bbabf353070a3e730464e0ce2960e2')
+
+_builddir=kdeadmin
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdeadmin.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-shadow \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdeartwork artwork collection"
+pkgdesc="Trinity artwork collection"
 depends=('trinity-kdebase' 'trinity-arts' 'xscreensaver' 'libart-lgpl' 'glproto')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdeedu
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity educational applications and tools"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
+md5sums=('37a14a67c4d00babc3015c6a31698cb0')
+
+_builddir=kdeedu
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdeedu.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdegames
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity games collection"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
+md5sums=('6c63e161050939f53921bfceb923a19e')
+
+_builddir=kdegames
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdegames.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdegraphics"
+kgdesc="Trinity graphics applications and tools"
 depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib' 'imlib' 'sane')
 makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
 # 'poppler-qt'
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
@ -0,0 +1,65 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdemultimedia
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity multimedia applications and tools"
+depends=('trinity-kdelibs' 'xine-lib' 'libvorbis' 'trinity-arts' 'alsa-lib' 'cdparanoia' 'lame' 'audiofile' 'libtheora' 'flac')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz)
+md5sums=('6d906b8a8fd0928e01ecd600175381c0')
+
+_builddir=kdemultimedia
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdemultimedia.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \
+     --enable-closure \
+     --with-vorbis \
+     --with-alsa \
+     --with-cdparanoia \
+     --with-lame \
+     --with-audiofile \
+     --with-theora \
+     --with-flac \
+     --with-kscd-cdda \
+     --with-xine
+     #--with-gstreamer
+     #--with-akode \
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdenetwork network utilities"
+pkgdesc="Trinity network utilities"
 depends=('trinity-kdebase' 
         'trinity-arts' 
         'speex' 
--- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
@ -7,9 +7,8 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdepim"
-depends=(
-         'trinity-kdebase'
+pkgdesc="Trinity Personal Information Management suite"
+depends=('trinity-kdebase'
         'trinity-arts'
         'trinity-kdelibs'
         'gpgme'
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdesdk"
+pkgdesc="Trinity Software Developement Kit"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdetoys
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity toys collection"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
+md5sums=('823dd778c1e9e15972a509f4eee4434d')
+
+_builddir=kdetoys
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdetoys.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
@ -0,0 +1,56 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kdeutils
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity TDE utilities collection"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
+md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83')
+
+_builddir=kdeutils
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < kdeutils.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-xmms
+     #--with-snmp \
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - kdevelop"
+pkgdesc="Trinity Developement tools"
 depends=('trinity-kdebase')
 #         'xorg'
 makedepends=('pkgconfig' 'cmake' 'imake')
--- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
-pkgdesc="Trinity - Web development tools"
+pkgdesc="Trinity Web development tools"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
--- a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Calvin Morrison <mutantturkey@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-konversation
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity')
-pkgdesc="Trinity - Konversation IRC client"
-depends=('trinity-kdelibs' 'trinity-qt3' 'trinity-tqtinterface')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
-md5sums=('0f0e0415dad4c19bc885c9addadf4026')
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
-  export CFLAGS=-I/opt/triniy/include/tqt
-  export CXXFLAGS=-I/opt/trinity/include/tqt
-
-  trinity_prefix="/opt/trinity"
-  
-  msg "Starting cmake..."
-  
-  cd "$srcdir/applications/konversation"
-  make -f admin/Makefile.common
-  ./configure --with-qt-dir=/opt/qt/ --prefix=/opt/trinity
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
-}
--- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
@ -0,0 +1,55 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-libkdcraw
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity DCRaw library"
+depends=('trinity-kdelibs' 'openmpi')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz)
+md5sums=('770dd734dc427337a1a2e61b6b0874ae')
+
+_builddir=libraries/libkdcraw
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < libkdcraw.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --enable-openmp \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-libkexiv2
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity exiv2 library"
+depends=('trinity-kdelibs' 'exiv2')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
+md5sums=('74b160da8ea95f25048757b5fe692f85')
+
+_builddir=libraries/libkexiv2
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < pkname.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-libkipi
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity kipi library"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
+md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
+
+_builddir=libraries/libkipi
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < libkipi.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/3.5.13_broken/README
+++ b/arch/3.5.13_broken/README
@ -23,30 +23,5 @@ Problems with builds:
      If it cannot be fixed, maybe whole CMake should
      be rewritten for this?

-   knetworkmanager8
-   knetworkmanager9
-      CMake does not detect dbus-1-tqt. We provide 
-      dbus-tqt-1, for which we pull tarball called
-      dbus-1-tqt. It should be the same thing, but
-      after chenaging Cmake instructions to search
-      for dbus-tqt-1 which we provide, it still 
-      fails.
-      Patch provides missing cmake modules.
-
-   kpilot:
-      same as above (probably) plus "CMakeOptions.txt 
-      not found! Run configure first." Error.
-      Do we need kpilot? Is Palm devices supported
-      by it still alive?
-
-   kde-style-lipstick:
-      not ported to CMake. Autotools TQt, Qt detection
-      problems.
-
   wlassistant:
-      not potted to Cmake. Same as above.
-   
-   rosegarden:
-      same as kgtk-qt3. I think every else trinity component
-      using CMake files wrote by KDE team won't work
-      with trinity tmoc.
+      hardcoded incudes? Does not compile?
--- a/arch/3.5.13_broken/trinity-knetworkmanager8/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-knetworkmanager8/PKGBUILD
@ -1,49 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-knetworkmanager
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Networkmanager applet"
-depends=('trinity-kdebase' 'networkmanager' 'dbus' 'hal' 'trinity-dbus-tqt-1')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/knetworkmanager8-3.5.13.tar.gz' 'knetworkmanager.patch')
-md5sums=('def7b5d1fae4d407d05507fe8bc47f5c'
-         'bc1fba7f0cd2ee6264c986a56f725669')
-
-_svnmod=applications/knetworkmanager8
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  #patch -N -d ${srcdir} -p0 < knetworkmanager.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-} 
--- a/arch/3.5.13_broken/trinity-knetworkmanager8/knetworkmanager.patch
+++ b/arch/3.5.13_broken/trinity-knetworkmanager8/knetworkmanager.patch
--- a/arch/3.5.13_broken/trinity-knetworkmanager9/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-knetworkmanager9/PKGBUILD
@ -1,49 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-knetworkmanager
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Networkmanager applet"
-depends=('trinity-kdebase' 'networkmanager' 'dbus' 'hal' 'trinity-dbus-tqt-1')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/knetworkmanager9-3.5.13.tar.gz' 'knetworkmanager.patch')
-md5sums=('11108480d620db10e7848446750e2cc7'
-         'bc1fba7f0cd2ee6264c986a56f725669')
-
-_svnmod=applications/knetworkmanager9
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  patch -N -d ${srcdir} -p0 < knetworkmanager.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-} 
--- a/arch/3.5.13_broken/trinity-knetworkmanager9/knetworkmanager.patch
+++ b/arch/3.5.13_broken/trinity-knetworkmanager9/knetworkmanager.patch
--- a/arch/3.5.13_broken/trinity-kpilot/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-kpilot/PKGBUILD
@ -1,55 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kpilot
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - kpilot Palm sync tool"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kpilot-3.5.13.tar.gz)
-md5sums=('adac05d936e6947ac0b1033c8d3192cd')
-
-_svnmod=applications/kpilot
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  # Baho additions
-  CFLAGS=${CFLAGS}" -fpermissive"
-  CXXFLAGS=${CXXFLAGS}" -fpermissive"
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_IFP=ON \
-    -DWITH_NJB=ON \
-    -DWITH_MTP=ON \
-    -DWITH_DAAP=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
--- a/arch/3.5.13_broken/trinity-lipstik/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-lipstik/PKGBUILD
@ -1,52 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-style-lipstik
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Lipstik sytle"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
-md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
-
-_svnmod=applications/kde-style-lipstik
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-  
-  export CFLAGS=-I/opt/trinity/include/tqt
-  export CXXFLAGS=-I/opt/trinity/include/tqt
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir/${_svnmod}
-  make -f admin/Makefile.common
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
--- a/arch/3.5.13_broken/trinity-rosegarden/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-rosegarden/PKGBUILD
@ -1,54 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-rosegarden
-pkgver=3513
-pkgrel=170
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - Rosegarden, A MIDI and audio sequencer and musical notation editor."
-depends=('trinity-kdelibs' 'dssi' 'jack' 'liblo' 'liblrdf' 'fftw') 
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/rosegarden-3.5.13.tar.gz)
-md5sums=('8906d1797bae89920d9a9ab54c09b49d')
-
-_svnmod=applications/rosegarden
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_MOC_EXECUTABLE=/opt/trinity/bin/tmoc \
-    -DWANT_DEBUG=OFF \
-    -DWANT_FULLDBG=OFF \
-    -DWANT_SOUND=ON \
-    -DWANT_JACK=ON \
-    -DWANT_DSSI=ON \
-    -DWANT_LIRC=ON \
-    -DWANT_PCH=OFF \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
--- a/arch/3.5.13_broken/trinity-wlassistant/PKGBUILD
+++ b/arch/3.5.13_broken/trinity-wlassistant/PKGBUILD
@ -3,44 +3,46 @@
 pkgname=trinity-wlassistant
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
-groups=('trinity-extras')
+groups=('trinity')
 pkgdesc="Trinity - wlassistant"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
+
+depends=('trinity-kdelibs' 'trinity-pyqt3')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'scons')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/wlassistant-3.5.13.tar.gz)
 md5sums=('1fd3680a634fedee3c2d90b81c1ffe23')

-_svnmod=applications/wlassistant
+_builddir=applications/wlassistant
+_prefix=/opt/trinity

 build() {

-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig

-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  cd ${srcdir}/${_builddir}
+  msg "Starting configure..."
+  ./configure --qtdir=${QTDIR} \
+     --qtlibs=${QTDIR}/lib \
+     --kdedir=${_prefix} \
+     --prefix=${_prefix} \
+     --kdeincludes=${_prefix}/include \
+     --kde-libs=${_prefix}/lib

-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
+  msg "Building ${pkgname}..."
  make
 }

 package() {
  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
--- a/arch/extras/README
+++ b/arch/extras/README
@ -0,0 +1,12 @@
+contents of this directory
+
+   autotools_PKGBUILD: example of PKGBUILD for building 
+      trinity components with autotools. Should be used 
+      as template for new PKGBUILDS.
+   
+   cmake_PKGBUILD: example of PKGBUILD for building 
+      trinity components with CMake. Should be used as 
+      a template for new PKGBUILDS.
+   
+   batchbuild: simple scirpt for batch building trinity 
+      components.
--- a/arch/extras/autotools_PKGBUILD
+++ b/arch/extras/autotools_PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-pkname
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - pkgdesc"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+optdepends=()
+provides=($pkgname)
+conflicts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/pkname-3.5.13.tar.gz)
+md5sums=('pkgmd5')
+
+_builddir=applications/pkname
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  #msg "Patching..."
+  #patch -N -d ${srcdir} -p0 < pkname.patch
+  
+  msg "Starting automake..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --enable-closure \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}
--- a/arch/scripts/buildarchbinaries
+++ b/arch/scripts/buildarchbinaries
--- a/arch/extras/cmake_PKGBUILD
+++ b/arch/extras/cmake_PKGBUILD
@ -0,0 +1,60 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-pkname
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-extras')
+pkgdesc="Trinity - pkgdesc"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'cmake' 'imake')
+optdepends=()
+provides=($pkgname)
+confilcts=()
+replaces=()
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/pkname-3.5.13.tar.gz)
+md5sums=('')
+
+_svnmod=applications/kpowersave
+_builddir=build
+_prefix="/opt/trinity"
+
+build() {
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+   export CMAKE_INCLUDE_PATH=${QTDIR}/include:${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr
+   export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+# patch
+# msg "Patching..."
+# patch -N -d ${srcdir} -p0 < ${srcdir}/pkname.patch
+
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${_builddir}
+   cd ${_builddir}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=${QTDIR} \
+    -DQT_DOCDIR=${QTDIR}/man \
+    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
+    -DBUILD_ALL=ON
+
+   msg "Building - $pkgname..."
+   make
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/${_builddir}
+   make DESTDIR="${pkgdir}" install
+}
--- a/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch
+++ b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch
@ -1,6 +1,6 @@
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10.p/messages/kdebase/kcmiccconfig.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po	1970-01-01 01:00:00.000000000 +0100
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po	2011-11-01 17:01:47.942636702 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po	2011-12-18 12:12:34.087743324 +0100
@@ -0,0 +1,76 @@
 +# TDE 3.5.13 'iccconfig.cpp' translation
 +
@ -78,10 +78,47 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3
 +#: iccconfigbase.ui:140
 +msgid "Settings for output"
 +msgstr "Appliquer à la sortie"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10.p/messages/kdebase/kdesktop.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-11-01 17:14:54.379412830 +0100
-@@ -1144,3 +1144,20 @@
+++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po	2011-12-18 18:12:48.482642367 +0100
+@@ -553,6 +553,36 @@
+ "</ul>\n"
+ "</qt>"
+ 
+# kdesktop/minicli_ui.ui:188
+msgid "Autocomplete shows available &applications"
+msgstr "L'autocomplétion affiche les &applications disponibles"
+
+# kdesktop/minicli_ui.ui:191
+msgid ""
+"<qt>When enabled, the system shows available applications in the autocompletion area."
+"</qt>"
+msgstr ""
+"<qt>Lorsque cette case est cochée, le système affiche les applications "
+"disponibles dans la zone d'autocomplétion.</qt>"
+
+
+# kdesktop/minicli_ui.ui:200
+msgid "Autocomplete uses &filesystem instead of history"
+msgstr "L'autocomplétion utilise le système de &fichiers au lieu de l'historique"
+
+# kdesktop/minicli_ui.ui:203
+msgid ""
+"<qt>This selects whether the filesystem and the past command history will be used for autocompletion."
+"</qt>"
+msgstr ""
+"<qt>En cochant cette case, l'autocomplétion utilise le système de fichiers à la place  de l'historique."
+"</qt>"
+
+
+# kdesktop/minicli_ui.ui:212
+msgid "Autocomplete uses &both history and filesystem"
+msgstr "L'autocomplétion utilise l'historique &et le système de fichiers"
+
+ #. i18n: file minicli_ui.ui line 199
+ #: rc.cpp:14
+ #, no-c-format
+@@ -1144,3 +1182,20 @@
 "Cependant, certains écrans de veille\n"
 "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
 "pas les désactiver."
@ -102,10 +139,10 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.1
 +#: lockdlg.cc:139
 +msgid "This session has been locked since %1"
 +msgstr "Cette session est verrouillée depuis %1"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10/messages/kdebase/kicker.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10.p/messages/kdebase/kicker.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po	2011-11-01 16:16:16.453636429 +0100
-@@ -754,3 +754,8 @@
+++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po	2011-12-18 20:30:31.365135597 +0100
+@@ -754,3 +754,292 @@
 #, no-c-format
 msgid "Custom size"
 msgstr "Taille personnalisée"
@ -114,9 +151,293 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10/
 +#: panelextension.cpp:385
 +msgid "&Launch Process Manager..."
 +msgstr "Gestionnaire de taches..."
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10/messages/kdebase/konsole.po
+
+## Kickoff menu (k_new_mnu.cpp) 
+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
+msgstr "Utilisateur&nbsp;<b>%1</b>&nbsp;sur&nbsp;<b>%2</b>"
+
+msgid "Most commonly used applications and documents"
+msgstr "Applications et documents utilisés récemment"
+
+msgid "Search:"
+msgstr "Chercher:"
+
+msgid "List of installed applications"
+msgstr "Liste des applications installées"
+
+msgid ""
+"Information and configuration of your "
+"system, access to personal files, network resources and connected disk drives"
+msgstr ""
+"Informations et configuration de votre "
+"système, accès aux fichiers personnels, ressources réseau et disques connectés"
+
+msgid "Recently used applications and documents"
+msgstr "Applications et documents utilisés récemment"
+
+msgid ""
+"<qt>Logout, switch user, switch off or reset,"
+" suspend of the system"
+msgstr ""
+"<qt>Se déconnecter, changer d'utilisateur, éteindre,"
+" redémarrer ou interrompre le système"
+               
+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
+msgstr "<p align=\"center\"> <u>F</u>avoris</p>"
+
+msgid "<p align=\"center\"><u>H</u>istory</p>"
+msgstr "<p align=\"center\"><u>H</u>istorique</p>"
+
+msgid "<p align=\"center\"> <u>C</u>omputer</p>"
+msgstr "<p align=\"center\"> <u>O</u>rdinateur</p>"
+
+msgid "<p align=\"center\"><u>A</u>pplications</p>"
+msgstr "<p align=\"center\"><u>A</u>pplications</p>"
+
+msgid "<p align=\"center\"><u>L</u>eave</p>"
+msgstr "<p align=\"center\"><u>Q</u>uitter</p>"
+
+msgid "Search Internet"
+msgstr "Chercher sur Internet"
+
+msgid "Search Index"
+msgstr "Chercher dans l'index"
+
+msgid "Applications, Contacts and Documents"
+msgstr "Applications, Concacts et Documents"
+
+msgid "Start '%1'"
+msgstr "Démarrer '%1'"
+
+msgid "Start '%1' (current)"
+msgstr "Démarrer '%1' (actuel)"
+
+msgid "Restart and boot directly into '%1'"
+msgstr "Redémarrer et amorcer directement '%1'"
+
+msgid "Start a parallel session"
+msgstr "Démarrer une session parallèle"
+
+msgid "Switch to Session of User '%1'"
+msgstr "Basculer vers la session de l'utilisateur '%1'"
+
+msgid "Session: %1"
+msgstr "Session: %1"
+
+msgid "New Applications"
+msgstr "Nouvelles Applications"
+
+msgid "Session"
+msgstr "Session"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "End session"
+msgstr "Terminer la session"
+
+msgid "Lock"
+msgstr "Verrouiller"
+
+msgid "Lock screen"
+msgstr "Verrouiller l'écran"
+
+msgid "Save current Session for next login"
+msgstr "Enregistrer la session courante pour la prochaine connexion"
+
+msgid "Manage parallel sessions"
+msgstr "Gérer les sessions parallèles"
+
+msgid "System"
+msgstr "Système"
+
+msgid "Shutdown Computer"
+msgstr "Eteindre l'ordinateur"
+
+msgid "Turn off computer"
+msgstr "Eteindre l'ordinateur"
+
+msgid "&Restart Computer"
+msgstr "&Redémarrer l'ordinateur"
+
+msgid "Restart and boot the default system"
+msgstr "Redémarrer et amorcer le système par défaut"
+
+msgid "Start Operating System"
+msgstr "Démarrer le système d'Exploitation"
+
+msgid "Restart and boot another operating system"
+msgstr "Redémarrer et amorcer un autre système d'exploitation"
+
+msgid "System Information"
+msgstr "Informations Système"
+
+msgid "System Folders"
+msgstr "Dossiers Système"
+
+msgid "Home Folder"
+msgstr "Dossier personnel"
+
+msgid "My Documents"
+msgstr "Mes Documents"
+
+msgid "Network Folders"
+msgstr "Dossiers Réseau"
+
+msgid ""
+"<center><b>%1</b></center>\n"
+"You do not have permission to execute "
+"this command."
+msgstr ""
+"<center><b>%1</b></center>\n"
+"Vous n'êst pas autorisé(e) à exécuter "
+"cette commande."
+
+msgid ""
+"<center><b>%1</b></center>\n"
+"Could not run the specified command."
+msgstr ""
+"<center><b>%1</b></center>\n"
+"La commande spécifiée n'a pas pu être exécutée."
+
+msgid ""
+"<center><b>%1</b></center>\n"
+"The specified command does not exist."
+msgstr ""
+"<center><b>%1</b></center>\n"
+"La commande spécifiée n'existe pas."
+
+msgid "Documents"
+msgstr "Documents"
+
+msgid "Open Addressbook at %1"
+msgstr "Ouvrir le carnet d'adresse à %1"
+
+msgid "- Add ext:type to specify a file extension."
+msgstr "- Ajouter ext:type pour indiquer une extension de fichier"
+
+msgid "- When searching for a phrase, add quotes."
+msgstr "- Pour chercher une phrase, ajouter des guillemets."
+
+msgid "- To exclude search terms, use the minus symbol in front."
+msgstr "- Pour exclure des éléments recherchés, utiliser le préfixe moins."
+
+msgid "- To search for optional terms, use OR."
+msgstr "- Pour chercher des termes optionnels, utiliser OR."
+
+msgid "- You can use upper and lower case."
+msgstr "- Vous pouvez écrire en majuscules ou minuscules."
+
+msgid "Search Quick Tips"
+msgstr "Astuces de la recherche rapide"
+
+msgid "%1 = %2"
+msgstr "%1 = %2"
+
+msgid "Send Email to %1"
+msgstr "Envoyer un Email à %1"
+
+msgid "Open Local File: %1"
+msgstr "Ouvrir le fichier local: %1"
+
+msgid "Open Local Dir: %1"
+msgstr "Ouvrir le répertoire local: %1"
+
+msgid "Open Remote Location: %1"
+msgstr "Ouvrir l'emplacement distant: %1"
+
+msgid "Run '%1'"
+msgstr "Exécuter '%1'"
+
+msgid "No matches found"
+msgstr "Aucune correspondance trouvée"
+
+msgid "top %1 of %2"
+msgstr "Haut %1 de %2"
+
+msgid "%1 (top %2 of %3)"
+msgstr "%1 (haut %2 de %3)"
+
+msgid "Do you really want to end the session?"
+msgstr "Voulez-vous vraiment terminer cette session ?"
+
+msgid "Logout Confirmation"
+msgstr "Confirmer la déconnexion"
+
+msgid "Do you really want to turn off the computer?"
+msgstr "Voulez-vous vraiment éteindre l'ordinateur ?"
+
+msgid "Shutdown Confirmation"
+msgstr "Confirmer l'arrêt"
+
+msgid "Shutdown"
+msgstr "Arrêter"
+
+msgid "Do you really want to reset the computer and boot (another operating system)?"
+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer (un autre système d'exploitation) ?"
+
+msgid "Restart Confirmation"
+msgstr "Confirmer le redémarrage"
+
+msgid "Restart"
+msgstr "Redémarrer"
+
+msgid "Do you really want to reset the computer and boot Microsoft Windows"
+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer Windows"
+
+msgid "Start Windows Confirmation"
+msgstr "Confirmer le démarrage de Windows"
+
+msgid "Start Windows"
+msgstr "Démarrer Windows"
+
+msgid "Could not start Tomboy."
+msgstr "Impossible de démarrer Tomboy."
+
+msgid "Remove From Favorites"
+msgstr "Supprimer des favoris"
+
+msgid "Add to Favorites"
+msgstr "Ajouter aux favoris"
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "Clear Recently Used Applications"
+msgstr "Vider la liste d'applications récentes"
+
+msgid "Clear Recently Used Documents"
+msgstr "Vider la liste des documents récents"
+
+msgid "Media"
+msgstr "Media"
+
+msgid "(%1 available)"
+msgstr "(%1 disponible)"
+
+msgid "Directory: %1"
+msgstr "Répertoire: %1"
+
+msgid "Suspend Computer"
+msgstr "Mettre en veille l'ordinateur"
+
+msgid "Suspend to Disk"
+msgstr "Mettre en veille l'ordinateur (sur disque)"
+
+msgid "Pause without logging out"
+msgstr "Mettre en pause sans se déconnecter"
+
+msgid "Suspend to RAM"
+msgstr "Mettre en veille l'ordinateur (en RAM)"
+
+msgid "Standby"
+msgstr "Mettre en veille"
+
+msgid "Suspend failed"
+msgstr "La mise en veille a échoué"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10.p/messages/kdebase/konsole.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po	2011-11-01 16:16:16.453636429 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po	2011-12-18 12:12:34.093743256 +0100
@@ -1475,3 +1475,8 @@
 #: zmodem_dialog.cpp:28
 msgid "&Stop"
@ -126,9 +447,9 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10
 +#: konsole.cpp:736
 +msgid "&Open.."
 +msgstr "Ouvrir.."
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10/messages/kdebase/krandr.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10.p/messages/kdebase/krandr.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po	2008-08-19 20:29:30.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po	2011-11-01 17:42:36.100570353 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po	2011-12-18 12:12:34.094743245 +0100
@@ -301,3 +301,33 @@
 "_: Refresh rate in Hertz (Hz)\n"
 "%1 Hz"
@ -163,9 +484,9 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10/
 +#: configdialog.cpp:49
 +msgid "Global &Shortcuts"
 +msgstr "Raccourcis Globaux"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksmserver.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po	2007-05-14 10:07:36.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po	2011-11-01 17:29:02.909615530 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po	2011-12-18 12:12:34.095743233 +0100
@@ -92,3 +92,14 @@
 "_: current option in boot loader\n"
 " (current)"
@ -181,9 +502,9 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.
 +msgid "Saving your settings..."
 +msgstr "Enregistrement de vos paramètres ..."
 +
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksplash.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po	2005-09-10 13:02:44.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po	2011-11-01 17:03:49.799926756 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po	2011-12-18 12:12:34.095743233 +0100
@@ -105,5 +105,5 @@
 msgstr "Rétablissement de la session"
 
@ -192,9 +513,9 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10
 -msgstr "KDE est prêt"
 +msgid "Trinity is up and running"
 +msgstr "Trinity est prêt"
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10.p/messages/kdebase/Makefile.in
 --- kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in	2008-08-20 09:14:47.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in	2011-11-01 16:32:57.157386765 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in	2011-12-18 12:12:34.096743221 +0100
@@ -192,8 +192,8 @@
 SUBDIRS =.
 #>- POFILES = AUTO
@ -244,9 +565,9 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.1
 
 #>+ 2
 all-nls: $(GMOFILES)
-diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10.p/messages/kdelibs/kdelibs.po
 --- kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po	2008-08-19 20:29:58.000000000 +0200
-+++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po	2011-11-01 17:02:35.529386462 +0100
+++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po	2011-12-18 12:19:38.552013274 +0100
@@ -5557,123 +5557,104 @@
 
 #: kdeui/kaboutkde.cpp:34
@ -434,7 +755,7 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10
 #: kdeui/kaboutkde.cpp:83
 msgid ""
 -"_: About KDE\n"
-+"About Trinity"
+"_: About Trinity\n"
 "&About"
 msgstr "À &propos"
 
@ -455,7 +776,18 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10
 
 #: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
 msgid "&Yes"
-@@ -6623,8 +6604,8 @@
+@@ -6286,6 +6267,10 @@
+ msgid "&Browse..."
+ msgstr "&Parcourir..."
+ 
+#: kdeui/kdialog.cpp:428
+msgid "Please wait..."
+msgstr "Veuillez patienter ..."
+
+ #: kdeui/kdialogbase.cpp:636
+ msgid "&Try"
+ msgstr "&Essayer"
+@@ -6623,8 +6608,8 @@
 msgstr "À &propos de : %1"
 
 #: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114
@ -466,3 +798,316 @@ diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10
 
 #: kdeui/kactionclasses.cpp:2072
 msgid "Exit F&ull Screen Mode"
+diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po	2011-12-18 22:34:04.982863520 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po	2011-12-18 22:40:37.574949536 +0100
+@@ -34,8 +34,8 @@
+ msgstr "duranceau@kde.org,caulier.gilles@free.fr,cousin@kde.org,kde@macolu.org"
+ 
+ #: aboutwidget.cpp:43 main.cpp:104
+-msgid "KDE Control Center"
+-msgstr "Centre de configuration de KDE"
+msgid "Trinity Control Center"
+msgstr "Centre de configuration de Trinity"
+ 
+ #: aboutwidget.cpp:45
+ msgid "Configure your desktop environment."
+@@ -43,17 +43,17 @@
+ 
+ #: aboutwidget.cpp:47
+ msgid ""
+-"Welcome to the \"KDE Control Center\", a central place to configure your "
+"Welcome to the \"Trinity Control Center\", a central place to configure your "
+ "desktop environment. Select an item from the index on the left to load a "
+ "configuration module."
+ msgstr ""
+-"Bienvenue dans le « Centre de configuration de KDE », l'endroit où configurer "
+"Bienvenue dans le « Centre de configuration de Trinity », l'endroit où configurer "
+ "votre environnement. Sélectionnez un élément dans l'index à gauche pour charger "
+ "le module de configuration correspondant."
+ 
+ #: aboutwidget.cpp:53 main.cpp:108
+-msgid "KDE Info Center"
+-msgstr "Centre d'informations de KDE"
+msgid "Trinity Info Center"
+msgstr "Centre d'informations de Trinity"
+ 
+ #: aboutwidget.cpp:55
+ msgid "Get system and desktop environment information"
+@@ -61,10 +61,10 @@
+ 
+ #: aboutwidget.cpp:57
+ msgid ""
+-"Welcome to the \"KDE Info Center\", a central place to find information about "
+"Welcome to the \"Trinity Info Center\", a central place to find information about "
+ "your computer system."
+ msgstr ""
+-"Bienvenue dans le « Centre d'informations de KDE », l'endroit où trouver des "
+"Bienvenue dans le « Centre d'informations de Trinity », l'endroit où trouver des "
+ "informations sur votre système."
+ 
+ #: aboutwidget.cpp:61
+@@ -76,8 +76,8 @@
+ "configuration particulière."
+ 
+ #: aboutwidget.cpp:64
+-msgid "KDE version:"
+-msgstr "Version de KDE :"
+msgid "Trinity version:"
+msgstr "Version de Trinity :"
+ 
+ #: aboutwidget.cpp:65
+ msgid "User:"
+@@ -137,13 +137,13 @@
+ 
+ #: helpwidget.cpp:51
+ msgid ""
+-"<h1>KDE Info Center</h1>There is no quick help available for the active info "
+"<h1>Trinity Info Center</h1>There is no quick help available for the active info "
+ "module."
+ "<br>"
+ "<br>Click <a href = \"kinfocenter/index.html\">here</a> "
+ "to read the general Info Center manual."
+ msgstr ""
+-"<h1>Centre d'informations de KDE</h1> Désolé, aucune aide rapide n'est "
+"<h1>Centre d'informations de Trinity</h1> Désolé, aucune aide rapide n'est "
+ "disponible pour le module d'information courant."
+ "<br>"
+ "<br> Cliquez <a href = \"kinfocenter/index.html\">ici</a> "
+@@ -151,13 +151,13 @@
+ 
+ #: helpwidget.cpp:56
+ msgid ""
+-"<h1>KDE Control Center</h1>There is no quick help available for the active "
+"<h1>Trinity Control Center</h1>There is no quick help available for the active "
+ "control module."
+ "<br>"
+ "<br>Click <a href = \"kcontrol/index.html\">here</a> "
+ "to read the general Control Center manual."
+ msgstr ""
+-"<h1>Centre de configuration de KDE</h1> Désolé, aucune aide rapide n'est "
+"<h1>Centre de configuration de Trinity</h1> Désolé, aucune aide rapide n'est "
+ "disponible pour le module de configuration courant."
+ "<br>"
+ "<br> Cliquez <a href = \"kcontrol/index.html\">ici</a> "
+@@ -173,16 +173,16 @@
+ "<br>Cliquez sur le bouton « Mode superutilisateur » ci-dessous."
+ 
+ #: main.cpp:105
+-msgid "The KDE Control Center"
+-msgstr "Le Centre de configuration de KDE"
+msgid "The Trinity Control Center"
+msgstr "Le Centre de configuration de Trinity"
+ 
+ #: main.cpp:106 main.cpp:110
+ msgid "(c) 1998-2004, The KDE Control Center Developers"
+ msgstr "(c) 1998-2004, Les développeurs du Centre de configuration de KDE"
+ 
+ #: main.cpp:109
+-msgid "The KDE Info Center"
+-msgstr "Le Centre d'informations de KDE"
+msgid "The Trinity Info Center"
+msgstr "Le Centre d'informations de Trinity"
+ 
+ #: main.cpp:128 main.cpp:130
+ msgid "Current Maintainer"
+--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kpersonalizer.po	2011-12-19 21:25:27.471340645 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/kpersonalizer.po	2011-12-19 21:29:05.386322708 +0100
+@@ -79,8 +79,8 @@
+ msgstr "Le style Platinium"
+ 
+ #: kcountrypage.cpp:48
+-msgid "<h3>Welcome to KDE %1</h3>"
+-msgstr "<h3>Bienvenue dans KDE %1</h3>"
+msgid "<h3>Welcome to Trinity %1</h3>"
+msgstr "<h3>Bienvenue dans Trinity %1</h3>"
+ 
+ #: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
+ msgid "without name"
+@@ -111,8 +111,8 @@
+ msgstr "L'assistant se redémarre lui-même"
+ 
+ #: main.cpp:32
+-msgid "Personalizer is running before KDE session"
+-msgstr "L'assistant démarre avant la session KDE elle-même"
+msgid "Personalizer is running before Trinity session"
+msgstr "L'assistant démarre avant la session Trinity elle-même"
+ 
+ #: kpersonalizer.cpp:67
+ msgid "Step 1: Introduction"
+@@ -141,13 +141,13 @@
+ #: kpersonalizer.cpp:152
+ msgid ""
+ "<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+-"<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your "
+"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to your "
+ "personal liking.</p>"
+ "<p>Click <b>Cancel</b> to return and finish your setup.</p>"
+ msgstr ""
+ "<p>Voulez-vous vraiment quitter l'assistant de configuration du bureau ?</p> "
+ "<p>L'assistant de configuration du bureau vous aide à configurer le bureau de "
+-"KDE selon vos convenances.</p> "
+"Trinity selon vos convenances.</p> "
+ "<p>Cliquez sur « <b>Annuler</b> » pour retourner et terminer vos réglages.</p>"
+ 
+ #: kpersonalizer.cpp:156
+@@ -171,14 +171,14 @@
+ "<br><b>Titlebar double-click:</b> <i>Shade window</i>"
+ "<br><b>Mouse selection:</b> <i>Single click</i>"
+ "<br><b>Application startup notification:</b> <i>busy cursor</i>"
+-"<br><b>Keyboard scheme:</b> <i>KDE default</i>"
+"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
+ "<br>"
+ msgstr ""
+ "<b>Activation des fenêtres :</b> <i>Cliquer pour avoir le focus</i>"
+ "<br><b>Double-clic sur la barre de titre :</b> <i>Enroule la fenêtre</i>"
+ "<br><b>Sélection par la souris :</b> <i>Simple clic</i>"
+ "<br><b>Notification de démarrage des applications :</b><i> Curseur occupé</i>"
+-"<br><b>Actions du clavier :</b> <i>KDE par défaut</i>"
+"<br><b>Actions du clavier :</b> <i>Trinity par défaut</i>"
+ "<br>"
+ 
+ #: kospage.cpp:364
+@@ -320,34 +320,34 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid ""
+-"<p>This Personalizer will help you configure the basic setup of your KDE "
+"<p>This Personalizer will help you configure the basic setup of your Trinity "
+ "desktop in five quick, easy steps. You can set things like your country (for "
+ "date and time formats, etc.), language, desktop behavior and more.</p>\n"
+-"<p>You will be able to change all the settings later using the KDE Control "
+"<p>You will be able to change all the settings later using the Trinity Control "
+ "Center. You may choose to postpone your personalization until later by clicking "
+ "on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
+ "for the country and language settings. However, new users are encouraged to use "
+ "this simple method.</p>\n"
+-"<p>If you already like your KDE configuration and wish to quit the Wizard, "
+"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
+ "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
+ msgstr ""
+ "<p>Cet assistant vous aidera à configurer les réglages de base de votre bureau "
+-"KDE en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
+"Trinity en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
+ "(pour les formats de date et d'heure, etc.), votre langue, le comportement du "
+ "bureau et plein d'autres encore.</p>\n"
+ "<p>Vous pourrez changer tous ces réglages ultérieurement en utilisant le Centre "
+-"de configuration de KDE. Vous pouvez choisir de différer votre personnalisation "
+"de configuration de Trinity. Vous pouvez choisir de différer votre personnalisation "
+ "en cliquant sur « <b>Passer l'assistant</b> ». Cependant, il est conseillé pour "
+ "les nouveaux utilisateurs d'utiliser cette méthode.</p>\n"
+-"<p>Si votre configuration de KDE est déjà à votre goût et que vous désirez "
+"<p>Si votre configuration de Trinity est déjà à votre goût et que vous désirez "
+ "quitter l'assistant, cliquez sur « <b>Passer l'assistant</b> » puis sur  « <b>"
+ "Quitter</b> ».</p>"
+ 
+ #. i18n: file kcountrypagedlg.ui line 100
+ #: rc.cpp:11
+ #, no-c-format
+-msgid "<h3>Welcome to KDE %VERSION%!</h3>"
+-msgstr "<h3>Bienvenue dans KDE %VERSION% !</h3>"
+msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
+msgstr "<h3>Bienvenue dans Trinity %VERSION% !</h3>"
+ 
+ #. i18n: file kcountrypagedlg.ui line 148
+ #: rc.cpp:14
+@@ -359,14 +359,14 @@
+ #: rc.cpp:17
+ #, no-c-format
+ msgid ""
+-"<P>KDE offers many visually appealing special effects, such as smoothed fonts, "
+"<P>Trinity offers many visually appealing special effects, such as smoothed fonts, "
+ "previews in the file manager and animated menus. All this beauty, however, "
+ "comes at a small performance cost. </P>\n"
+ "If you have a fast, new processor, you might want to turn them all on, but for "
+ "those of us with slower processors, starting off with less eye candy helps to "
+ "keep your desktop more responsive."
+ msgstr ""
+-"<P>KDE offre de nombreux effets visuels, comme les polices lissées, les aperçus "
+"<P>Trinity offre de nombreux effets visuels, comme les polices lissées, les aperçus "
+ "dans le gestionnaire de fichiers et les menus animés. Toutes ces choses "
+ "superbes ont un coût en termes de performances.</P>\n"
+ "Si vous avez un processeur récent et rapide, vous pouvez toutes les activer, "
+@@ -426,8 +426,8 @@
+ #. i18n: file kospagedlg.ui line 79
+ #: rc.cpp:44
+ #, no-c-format
+-msgid "KDE (TM)"
+-msgstr "KDE ™"
+msgid "Trinity (TM)"
+msgstr "Trinity"
+ 
+ #. i18n: file kospagedlg.ui line 90
+ #: rc.cpp:47
+@@ -454,22 +454,22 @@
+ "<b>System Behavior</b>"
+ "<br>\n"
+ "Graphical User Interfaces behave differently on various Operating Systems.\n"
+-"KDE allows you to customize its behavior according to your needs."
+"Trinity allows you to customize its behavior according to your needs."
+ msgstr ""
+ "<b>Comportement du système</b>"
+ "<br>\n"
+ "Les interfaces utilisateur graphiques se comportent différemment sur les "
+ "différents systèmes d'exploitation.\n"
+-"KDE vous permet de personnaliser son comportement selon vos désirs."
+"Trinity vous permet de personnaliser son comportement selon vos désirs."
+ 
+ #. i18n: file kospagedlg.ui line 168
+ #: rc.cpp:61
+ #, no-c-format
+ msgid ""
+-"For motion impaired users, KDE provides keyboard gestures to activate special "
+"For motion impaired users, Trinity provides keyboard gestures to activate special "
+ "keyboard settings."
+ msgstr ""
+-"Pour les utilisateurs à déplacement réduit, KDE fournit des gestes permettant "
+"Pour les utilisateurs à déplacement réduit, Trinity fournit des gestes permettant "
+ "d'activer des réglages spéciaux du clavier."
+ 
+ #. i18n: file kospagedlg.ui line 179
+@@ -494,26 +494,26 @@
+ #: rc.cpp:71
+ #, no-c-format
+ msgid ""
+-"You can refine the settings you made by starting the KDE Control Center by "
+"You can refine the settings you made by starting the Trinity Control Center by "
+ "choosing the entry <b>Control Center</b> in the K menu."
+ msgstr ""
+ "Vous pouvez affiner les réglages que vous avez faits en lançant le <b>"
+-"Centre de configuration de KDE</b> en choisissant l'entrée <b>"
+"Centre de configuration de Trinity</b> en choisissant l'entrée <b>"
+ "Centre de configuration</b> du menu K."
+ 
+ #. i18n: file krefinepagedlg.ui line 133
+ #: rc.cpp:74
+ #, no-c-format
+-msgid "You can also start the KDE Control Center using the button below."
+msgid "You can also start the Trinity Control Center using the button below."
+ msgstr ""
+-"Vous pouvez également démarrer le Centre de configuration de KDE à l'aide du "
+"Vous pouvez également démarrer le Centre de configuration de Trinity à l'aide du "
+ "bouton ci-dessous."
+ 
+ #. i18n: file krefinepagedlg.ui line 203
+ #: rc.cpp:77
+ #, no-c-format
+-msgid "&Launch KDE Control Center"
+-msgstr "&Lancer le Centre de configuration de KDE"
+msgid "&Launch Trinity Control Center"
+msgstr "&Lancer le Centre de configuration de Trinity"
+ 
+ #. i18n: file kstylepagedlg.ui line 32
+ #: rc.cpp:80
+--- kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po.ORI	2011-12-19 21:45:36.416030332 +0100
+++ kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po	2011-12-19 21:51:16.528801717 +0100
+@@ -1203,6 +1203,9 @@
+ msgid "Open in &New Tab"
+ msgstr "Ouvrir dans un &nouvel onglet"
+ 
+msgid "Open in &Background Tab"
+msgstr "Ouvrir dans un onglet en arrière-&plan"
+
+ #: konq_mainwindow.cc:4689
+ msgid "Open the document in a new tab"
+ msgstr "Ouvrir le document dans un nouvel onglet"
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec
@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 8
+%define release 9

 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@ -46,9 +46,6 @@ AutoReq: no

 Source0:	kde-i18n-%{version}.tar.gz

-# [zh_TW] Updated translations, thanks to Wei-Lun Chao !
-Source1:	kde-i18n-zh_TW-3.5.10.tar.bz2
-
 # TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
 Patch0:		kde-i18n-kdesu.patch

@ -58,6 +55,9 @@ Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
 # TDE 3.5.13: French translations for new features
 Patch2:		kde-i18n-3.5.13-add_french_translations.patch

+# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
+Patch3:		kde-i18n-3.5.13-add_zh_TW_translations.patch
+
 BuildRequires:	findutils
 BuildRequires:	gettext
 BuildRequires:	trinity-arts-devel
@ -622,7 +622,6 @@ Provides: %{name}-tz_TW = %{version}-%{release}

 %prep
 %setup -q -n kde-i18n
-%__cp -f %{SOURCE1} .

 for l in %{KDE_LANGS}; do
  for f in kde-i18n-${l}-*.tar.bz2; do
@ -632,7 +631,8 @@ done

 %patch0
 %patch1
-%patch2
+%patch2 -p0
+%patch3 -p0


 %build
@ -1159,6 +1159,9 @@ find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
 %endif

 %changelog
+* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9
+- Updates French translations (mostly Kickoff Menu related)
+
 * Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
 - Backport from TDE 3.5.13
 - Removes 'kde-filesystem" dependancy
--- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
+++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec
@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 5
+%define release 6

 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@ -46,9 +46,6 @@ AutoReq: no

 Source0:	kde-i18n-%{version}.tar.gz

-# [zh_TW] Updated translations, thanks to Wei-Lun Chao !
-Source1:	kde-i18n-zh_TW-3.5.10.tar.bz2
-
 # TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
 Patch0:		kde-i18n-kdesu.patch

@ -58,6 +55,9 @@ Patch1:		trinity-kde-i18n-fr-openterminalhere.patch
 # TDE 3.5.13: French translations for new features
 Patch2:		kde-i18n-3.5.13-add_french_translations.patch

+# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
+Patch3:		kde-i18n-3.5.13-add_zh_TW_translations.patch
+
 BuildRequires:	findutils
 BuildRequires:	gettext
 BuildRequires:	trinity-arts-devel
@ -622,30 +622,30 @@ Provides: %{name}-tz_TW = %{version}-%{release}

 %prep
 %setup -q -n kde-i18n
-%__cp -f %{SOURCE1} .

 for l in %{KDE_LANGS}; do
  for f in kde-i18n-${l}-*.tar.bz2; do
-    tar xjf ${f}
+    tar xjf "${f}"
  done
 done

 %patch0
 %patch1
-%patch2
+%patch2 -p0
+%patch3 -p0


 %build
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"

-export kde_htmldir=%{tde_docdir}/HTML
+export kde_htmldir="%{tde_docdir}/HTML"

 for l in %{KDE_LANGS}; do
  for f in kde-i18n-${l}-*/; do
    if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
      pushd ${f}
-      %configure --prefix=%{_prefix}
+      %configure
      %__make %{?_smp_mflags}
      popd
    fi
@ -653,22 +653,23 @@ for l in %{KDE_LANGS}; do
 done

 %install
-rm -rf %{?buildroot}
+%__rm -rf %{?buildroot}
 export PATH="%{_bindir}:${PATH}"

 for l in %{KDE_LANGS}; do
  for f in kde-i18n-${l}-*/; do
    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR=%{?buildroot} -C ${f}
+      %__make install DESTDIR="%{?buildroot}" -C "${f}"
    fi
  done
 done

 # make symlinks relative
-pushd %{buildroot}%{tde_docdir}/HTML
+%if "%{_prefix}" == "/usr"
+pushd "%{buildroot}%{tde_docdir}/HTML"
 for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
+  if [ -d "$lang" ]; then
+    pushd "$lang"
    for i in */*/*; do
      if [ -d $i -a -L $i/common ]; then
        rm -f $i/common
@ -694,9 +695,10 @@ for lang in *; do
  fi
 done
 popd   
+%endif

 # remove zero-length file
-find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \;
+find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;

 # See http://fedoraproject.org/wiki/Languages (???)
 %__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
@ -707,7 +709,7 @@ find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \;
 %endif

 # remove obsolete KDE 3 application data translations
-%__rm -rf %{buildroot}%{_datadir}/apps
+%__rm -rf "%{buildroot}%{_datadir}/apps"

 %clean
 %__rm -rf %{buildroot}
@ -1157,6 +1159,9 @@ find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \;
 %endif

 %changelog
+* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Updates French translations (mostly Kickoff Menu related)
+
 * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
 - Removes 'kde-filesystem" dependancy

--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@ -633,8 +633,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :

 # TDE 3.5.12 specific
 %{_bindir}/kde3
-#%exclude 
-%{_datadir}/applications/kde/display.desktop
+%exclude %{_datadir}/applications/kde/display.desktop
 %exclude %{_datadir}/fonts/override/fonts.dir
 %{_docdir}/kdm/README