RPM Packaging: update packages R14

63 files changed, 1208 insertions, 112 deletions

diff --git a/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control
index 330946e77..147f05010 100644
--- a/debian/lenny/applications/k3b/debian/control
+++ b/debian/lenny/applications/k3b/debian/control
@@ -92,3 +92,14 @@ Description: transitional package for K3b's extra decoders [Trinity]
  This is a dummy transitional package to enable a smooth transition from
  libk3b2-extracodecs to libk3b3-extracodecs.
  It may safely be removed after installation.
+
+Package: k3b-trinity-dbg
+Priority: extra
+Architecture: any
+Depends: k3b-trinity (= ${binary:Version})
+Recommends: tdelibs-trinity-dbg
+Description: debugging symbols for K3b [Trinity]
+ This package provides debugging symbols for all binary packages built from
+ k3b source package. It's highly recommended to have this package installed
+ before reporting any K3b crashes to either K3b developers or Debian
+ package maintainers.
diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index d0cb5d14d..8a0de39e0 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: k9copy-trinity
diff --git a/debian/lenny/libraries/libkdcraw/debian/control b/debian/lenny/libraries/libkdcraw/debian/control
index c2b0d1381..85c861ae7 100644
--- a/debian/lenny/libraries/libkdcraw/debian/control
+++ b/debian/lenny/libraries/libkdcraw/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
diff --git a/debian/lenny/libraries/libkdcraw/debian/control.in b/debian/lenny/libraries/libkdcraw/debian/control.in
index 362d77f1d..45daafd86 100644
--- a/debian/lenny/libraries/libkdcraw/debian/control.in
+++ b/debian/lenny/libraries/libkdcraw/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg62-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg62-dev, pkg-config,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/changelog b/debian/lenny/metapackages/synaptic-trinity/debian/changelog
new file mode 100644
index 000000000..176068d7f
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/changelog
@@ -0,0 +1,6 @@
+synaptic-trinity (2014.10.10-1) maverick; urgency=low
+
+  * NIGHTLY BUILDS
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Oct 2011 11:39:00 -0600
+
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/compat b/debian/lenny/metapackages/synaptic-trinity/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/control b/debian/lenny/metapackages/synaptic-trinity/debian/control
new file mode 100644
index 000000000..9bacfcdca
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/control
@@ -0,0 +1,15 @@
+Source: synaptic-trinity
+Section: misc
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>=5.0), cdbs
+Standards-Version: 3.8.4
+
+Package: synaptic-trinity
+Priority: important
+Architecture: all
+Depends: synaptic
+Description: Synaptic for the Trinity Desktop Environment
+ This package allows Synaptic to be launched without manually typing
+ a gain-root command such as tdesu each time; instead tdesu will be
+ automatically used to launch synaptic if this package is installed.
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/copyright b/debian/lenny/metapackages/synaptic-trinity/debian/copyright
new file mode 100644
index 000000000..d934ced33
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/copyright
@@ -0,0 +1,27 @@
+This is Debian GNU's GnuPG keyrings of archive keys.
+
+This package was originally put together by Michael Vogt
+<mvo@debian.org> 
+
+The keys in the keyrings don't fall under any copyright.  Everything
+else in the package is covered by the GNU GPL.
+
+Debian support files Copyright (C) 2006 Michael Vogt <mvo@debian.org> 
+based on the debian-keyring package maintained by James Troup 
+
+Debian support files for debian-archive-keyring are free software; you
+can redistribute them and/or modify them under the terms of the GNU
+General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.
+
+Debian support files for debian-archive-keyring are distributed in the
+hope that they will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU debian-archive-keyring source package as the file COPYING.
+If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301 USA.
+
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop b/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
new file mode 100644
index 000000000..7866d6869
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
@@ -0,0 +1,165 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+Name[ar]=مدير الحزم التشابكي
+Name[be]=Кіраўнік пакетаў Synaptic
+Name[be@latin]=Kiraŭnik pakunkaŭ Synaptic
+Name[bg]=Мениджър на пакети (Synaptic)
+Name[br]=Merour pakadoù Synaptic
+Name[bs]=Upravnik paketa „Synaptic“
+Name[ca]=Gestor de paquets Synaptic
+Name[ca@valencia]=Gestor de paquets Synaptic
+Name[cs]=Správce balíků Synaptic
+Name[da]=Synaptic - pakkehåndtering
+Name[de]=Synaptic-Paketverwaltung
+Name[el]=Διαχείριση πακέτων Synaptic
+Name[en_AU]=Synaptic Package Manager
+Name[en_GB]=Synaptic Package Manager
+Name[eo]=La pakaĵmastrumilo Sinaptiko
+Name[es]=Gestor de paquetes Synaptic
+Name[et]=Synaptic paketihaldur
+Name[eu]=Synaptic pakete-kudeatzailea
+Name[fi]=Synaptic-pakettienhallinta
+Name[fr]=Gestionnaire de paquets Synaptic
+Name[gl]=Xestor de paquetes Synaptic
+Name[he]=מנהל החבילות Synaptic
+Name[hi]=सिनेप्टिक पैकेज प्रबन्धक
+Name[hu]=Synaptic csomagkezelő
+Name[ia]=Administrator de pacchettos Synaptic
+Name[id]=Synaptic Manajer Paket
+Name[it]=Gestore pacchetti
+Name[ja]=Synaptic パッケージマネージャ
+Name[ko]=시냅틱 패키지 관리자
+Name[ku]=Rêveberê Pakêtan Synaptic
+Name[lt]=Paketų tvarkyklė Synaptic
+Name[mk]=Менаџер за пакети - Синаптик
+Name[ms]=Pengurus Pakej Synaptic
+Name[nb]=Synaptic pakkebehandler
+Name[nl]=Synaptic Pakketbeheer
+Name[no]=Synaptic Pakkeadministrasjon
+Name[pl]=Synaptic Menedżer Pakietów
+Name[pt]=Gestor de Pacotes Synaptic
+Name[pt_BR]=Gerenciador de pacotes Synaptic
+Name[ro]=Synaptic - administrator de pachete
+Name[ru]=Менеджер пакетов Synaptic
+Name[sk]=Synaptic - správca balíkov
+Name[sl]=Upravljalnik paketov Synaptic
+Name[sr]=Синаптик — управник пакета
+Name[sr@Latn]=Upravnik paketa „Synaptic“
+Name[sv]=Pakethanteraren Synaptic
+Name[th]=เครื่องมือจัดการแพกเกจ Synaptic
+Name[tr]=Synaptic Paket Yöneticisi
+Name[uk]=Менеджер пакунків Synaptic
+Name[xh]=UMlawuli woMqulu we-Synaptic
+Name[zh_CN]=新立得软件包管理器
+Name[zh_TW]=Synaptic 套件管理程式
+GenericName=Package Manager
+GenericName[ar]=مدير الحزم
+GenericName[be]=Кіраўнік пакетамі
+GenericName[be@latin]=Kiraŭnik pakunkaŭ
+GenericName[bg]=Мениджър на пакети
+GenericName[br]=Merour pakadoù
+GenericName[bs]=Upravnik paketa
+GenericName[ca]=Gestor de paquets
+GenericName[ca@valencia]=Gestor de paquets
+GenericName[cs]=Správce balíků
+GenericName[da]=Pakkehåndteringsprogram
+GenericName[de]=Paketverwaltung
+GenericName[el]=Διαχείριση πακέτων
+GenericName[en_AU]=Package Manager
+GenericName[en_GB]=Package Manager
+GenericName[eo]=Pakaĵmastrumilo
+GenericName[es]=Gestor de paquetes
+GenericName[et]=Paketihaldur
+GenericName[eu]=Pakete-kudeatzailea
+GenericName[fi]=Pakettienhallinta
+GenericName[fr]=Gestionnaire de paquets
+GenericName[gl]=Xestor de paquetes
+GenericName[he]=מנהל חבילות
+GenericName[hi]=पैकेज प्रबन्धक
+GenericName[hu]=Csomagkezelő
+GenericName[ia]=Administrator de pacchettos
+GenericName[id]=Manajer Paket
+GenericName[it]=Gestore pacchetti
+GenericName[ja]=パッケージマネージャ
+GenericName[ko]=패키지 관리자
+GenericName[ku]=Rêveberê Pakêtan
+GenericName[lt]=Paketų tvarkyklė
+GenericName[mk]=Менаџер за пакети
+GenericName[ms]=Pengurusan Pakej
+GenericName[nb]=Pakkebehandler
+GenericName[nl]=Pakketbeheerder
+GenericName[pl]=Menedżer pakietów
+GenericName[pt]=Gestor de Pacotes
+GenericName[pt_BR]=Gerenciador de pacotes
+GenericName[ro]=Administrator de pachete
+GenericName[ru]=Менеджер пакетов
+GenericName[sk]=Správca balíkov
+GenericName[sl]=Upravljalnik paketov
+GenericName[sr]=Управник пакета
+GenericName[sr@Latn]=Upravnik paketa
+GenericName[sv]=Pakethanterare
+GenericName[th]=เครื่องมือจัดการแพกเกจ
+GenericName[tr]=Paket Yöneticisi
+GenericName[uk]=Менеджер пакунків
+GenericName[xh]=UMlawuli woMqulu
+GenericName[zh_CN]=软件包管理器
+GenericName[zh_TW]=套件管理程式
+Comment=Install, remove and upgrade software packages
+Comment[ar]=ثبّت، أزل وحدّث حزم البرامج
+Comment[be]=Усталёўвае, выдаляе і абнаўляе пакеты
+Comment[be@latin]=Instaluj, vydalaj i aktualizuj prahramnyja pakunki
+Comment[bg]=Инсталиране, премахване и актуализиране на софтуерни пакети
+Comment[bn]=সফটওয়্যার প্যাকেজ ইনস্টল, অপসারণ এবং আপগ্রেড
+Comment[br]=Staliañ, dilemel hag hizivaat meziantoù
+Comment[bs]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[ca]=Instal·la, elimina i actualitza paquets de programari
+Comment[ca@valencia]=Instal·la, elimina i actualitza paquets de programari
+Comment[cs]=Nainstalovat, odstranit a aktualizovat balíky
+Comment[da]=Installér, fjern og opgradér softwarepakker
+Comment[de]=Software-Pakete installieren, entfernen und aktualisieren
+Comment[el]=Εγκατάσταση, απομάκρυνση και αναβάθμιση πακέτων λογισμικού
+Comment[en_AU]=Install, remove and upgrade software packages
+Comment[en_GB]=Install, remove and upgrade software packages
+Comment[eo]=Instali, forigi kaj promocii programarajn pakaĵojn
+Comment[es]=Instalar, desinstalar y actualizar los paquetes de software
+Comment[et]=Paigalda, eemalda ja uuenda tarkvarapakette
+Comment[eu]=Instalatu, kendu eta bertsio-berritu software-paketeak
+Comment[fi]=Asenna, poista ja päivitä ohjelmistopaketteja
+Comment[fr]=Installer, désinstaller et mettre à jour les paquets de logiciels
+Comment[gl]=Instalar, retirar e anovar os paquetes de software
+Comment[he]=התקנה, הסרה ושדרוג חבילות תכנה.
+Comment[hi]=सॉफ्टवेयर पैकेजों की स्थापना, अद्यतन करें या उन्हें हटाएं.
+Comment[hu]=Csomagok telepítése, törlése és frissítése
+Comment[it]=Installa, rimuove e aggiorna i pacchetti software
+Comment[ja]=ソフトウェアパッケージのインストール、削除またはアップグレード
+Comment[ko]=소프트웨어 패키지를 설치, 지우기, 업그레이드
+Comment[ku]=Pakêtên nivîsbariyê saz bike, jê bibe û bilindbike
+Comment[lt]=Įdiekite, šalinkite ir atnaujinkite programų paketus
+Comment[mk]=Инсталирајте, отстранете или надградете софтверски пакети
+Comment[ms]=Pasang, buang dan tatar pakej perisian
+Comment[nb]=Installer, fjern eller oppgrader programpakker
+Comment[nl]=Softwarepakketten installeren, verwijderen en opwaarderen
+Comment[no]=Installer, fjern eller oppgrader programvare pakker
+Comment[pl]=Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem
+Comment[pt]=Instalar, remover e actualizar pacotes
+Comment[pt_BR]=Instalar, remover e atualizar pacotes de software
+Comment[ro]=Instalează, dezinstalează și actualizează pachete de programe
+Comment[ru]=Установить, удалить и обновить пакеты
+Comment[sk]=Inštalovať, odstrániť alebo aktualizovať softvérové balíky
+Comment[sl]=Namestitev, odstranjevanje in nadgradnja programskih paketov
+Comment[sr]=Инсталирајте, уклоните и надоградите пакете програма
+Comment[sr@Latn]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[sv]=Installera, ta bort och uppgradera programpaket
+Comment[th]=ติดตั้ง ถอดถอน และปรับรุ่นแพกเกจซอฟต์แวร์
+Comment[tr]=Paketleri kur, kaldır ya da yükselt
+Comment[uk]=Встановлення, вилучення та оновлення пакунків програмного забезпечення
+Comment[xh]=Faka, susa uze uphucule imiqulu yesoftware
+Comment[zh_CN]=安装，删除和升级软件包
+Comment[zh_TW]=安裝、移除及升級套件
+Exec=synaptic
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;System;
+X-TDE-SubstituteUID=true
+OnlyShowIn=TDE;
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop b/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
new file mode 100644
index 000000000..4a2c1f867
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+GenericName=Package Manager
+Comment=Install, remove and upgrade software packages
+Exec=synaptic-pkexec
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;GTK;System;Settings;
+NotShowIn=KDE;TDE;
+X-Ubuntu-Gettext-Domain=synaptic
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/install b/debian/lenny/metapackages/synaptic-trinity/debian/install
new file mode 100644
index 000000000..4a167e5fa
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/install
@@ -0,0 +1,2 @@
+synaptic.desktop			usr/share/applications
+synaptic-tde.desktop			usr/share/applications
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/postrm b/debian/lenny/metapackages/synaptic-trinity/debian/postrm
new file mode 100644
index 000000000..e6d06626a
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/postrm
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove \
+                /usr/share/applications/synaptic.desktop
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/preinst b/debian/lenny/metapackages/synaptic-trinity/debian/preinst
new file mode 100644
index 000000000..eba99aba2
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/preinst
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    # remove old diversions if present
+    # add new diversion
+    dpkg-divert --package $package_name \
+    --divert /usr/share/applications/synaptic.desktop.distrib \
+    --rename /usr/share/applications/synaptic.desktop
+    ;;
+
+  upgrade)
+    # remove old diversion if present
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+        dpkg-divert --remove --package $package_name --rename "/usr/share/applications/synaptic.desktop"
+    fi
+
+    # add new diversion
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -z "$divert" ]; then
+        dpkg-divert --package $package_name \
+                    --divert /usr/share/applications/synaptic.desktop.distrib \
+                    --rename /usr/share/applications/synaptic.desktop
+    fi
+    ;;
+
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/rules b/debian/lenny/metapackages/synaptic-trinity/debian/rules
new file mode 100755
index 000000000..187d68f00
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
+DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+	dh_testdir
+	[ -e debian/stamp-distrospecific ] || \
+	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+	tee debian/stamp-distrospecific | \
+	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
+
+binary-install/synaptic-trinity::
+	dh_testdir
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/source/format b/debian/lenny/metapackages/synaptic-trinity/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/source/options b/debian/lenny/metapackages/synaptic-trinity/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/lenny/tdegraphics/debian/control b/debian/lenny/tdegraphics/debian/control
index 22be8fdc0..ed9f0dd1e 100644
--- a/debian/lenny/tdegraphics/debian/control
+++ b/debian/lenny/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control
index 330946e77..147f05010 100644
--- a/debian/squeeze/applications/k3b/debian/control
+++ b/debian/squeeze/applications/k3b/debian/control
@@ -92,3 +92,14 @@ Description: transitional package for K3b's extra decoders [Trinity]
  This is a dummy transitional package to enable a smooth transition from
  libk3b2-extracodecs to libk3b3-extracodecs.
  It may safely be removed after installation.
+
+Package: k3b-trinity-dbg
+Priority: extra
+Architecture: any
+Depends: k3b-trinity (= ${binary:Version})
+Recommends: tdelibs-trinity-dbg
+Description: debugging symbols for K3b [Trinity]
+ This package provides debugging symbols for all binary packages built from
+ k3b source package. It's highly recommended to have this package installed
+ before reporting any K3b crashes to either K3b developers or Debian
+ package maintainers.
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index d0cb5d14d..8a0de39e0 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: k9copy-trinity
diff --git a/debian/squeeze/libraries/libkdcraw/debian/control b/debian/squeeze/libraries/libkdcraw/debian/control
index c2b0d1381..85c861ae7 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/control
+++ b/debian/squeeze/libraries/libkdcraw/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
diff --git a/debian/squeeze/libraries/libkdcraw/debian/control.in b/debian/squeeze/libraries/libkdcraw/debian/control.in
index 362d77f1d..45daafd86 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/control.in
+++ b/debian/squeeze/libraries/libkdcraw/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg62-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg62-dev, pkg-config,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
diff --git a/debian/squeeze/metapackages/meta-tde/debian/control b/debian/squeeze/metapackages/meta-tde/debian/control
index 01388e4a4..ba5528639 100644
--- a/debian/squeeze/metapackages/meta-tde/debian/control
+++ b/debian/squeeze/metapackages/meta-tde/debian/control
@@ -34,7 +34,7 @@ Section: tde
 Priority: optional
 Replaces: kde-core-trinity (<< 5:55)
 Breaks: kde-core-trinity (<< 5:55)
-Depends: arts-trinity (>= 1.5.5), tdebase-trinity (>= 4:14.0.0~), tdelibs-trinity (>= 4:14.0.0~), sudo-trinity
+Depends: arts-trinity (>= 1.5.5), tdebase-trinity (>= 4:14.0.0~), tdelibs-trinity (>= 4:14.0.0~), sudo-trinity, synaptic-trinity
 Suggests: tde-i18n-trinity (>= 4:14.0.0~)
 Description: Trinity Desktop Environment core modules [Trinity]
  TDE (Trinity Desktop Environment) is a powerful Open Source graphical
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/changelog b/debian/squeeze/metapackages/synaptic-trinity/debian/changelog
new file mode 100644
index 000000000..176068d7f
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/changelog
@@ -0,0 +1,6 @@
+synaptic-trinity (2014.10.10-1) maverick; urgency=low
+
+  * NIGHTLY BUILDS
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Oct 2011 11:39:00 -0600
+
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/compat b/debian/squeeze/metapackages/synaptic-trinity/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/control b/debian/squeeze/metapackages/synaptic-trinity/debian/control
new file mode 100644
index 000000000..9bacfcdca
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/control
@@ -0,0 +1,15 @@
+Source: synaptic-trinity
+Section: misc
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>=5.0), cdbs
+Standards-Version: 3.8.4
+
+Package: synaptic-trinity
+Priority: important
+Architecture: all
+Depends: synaptic
+Description: Synaptic for the Trinity Desktop Environment
+ This package allows Synaptic to be launched without manually typing
+ a gain-root command such as tdesu each time; instead tdesu will be
+ automatically used to launch synaptic if this package is installed.
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/copyright b/debian/squeeze/metapackages/synaptic-trinity/debian/copyright
new file mode 100644
index 000000000..d934ced33
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/copyright
@@ -0,0 +1,27 @@
+This is Debian GNU's GnuPG keyrings of archive keys.
+
+This package was originally put together by Michael Vogt
+<mvo@debian.org> 
+
+The keys in the keyrings don't fall under any copyright.  Everything
+else in the package is covered by the GNU GPL.
+
+Debian support files Copyright (C) 2006 Michael Vogt <mvo@debian.org> 
+based on the debian-keyring package maintained by James Troup 
+
+Debian support files for debian-archive-keyring are free software; you
+can redistribute them and/or modify them under the terms of the GNU
+General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.
+
+Debian support files for debian-archive-keyring are distributed in the
+hope that they will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU debian-archive-keyring source package as the file COPYING.
+If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301 USA.
+
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop b/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
new file mode 100644
index 000000000..7866d6869
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
@@ -0,0 +1,165 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+Name[ar]=مدير الحزم التشابكي
+Name[be]=Кіраўнік пакетаў Synaptic
+Name[be@latin]=Kiraŭnik pakunkaŭ Synaptic
+Name[bg]=Мениджър на пакети (Synaptic)
+Name[br]=Merour pakadoù Synaptic
+Name[bs]=Upravnik paketa „Synaptic“
+Name[ca]=Gestor de paquets Synaptic
+Name[ca@valencia]=Gestor de paquets Synaptic
+Name[cs]=Správce balíků Synaptic
+Name[da]=Synaptic - pakkehåndtering
+Name[de]=Synaptic-Paketverwaltung
+Name[el]=Διαχείριση πακέτων Synaptic
+Name[en_AU]=Synaptic Package Manager
+Name[en_GB]=Synaptic Package Manager
+Name[eo]=La pakaĵmastrumilo Sinaptiko
+Name[es]=Gestor de paquetes Synaptic
+Name[et]=Synaptic paketihaldur
+Name[eu]=Synaptic pakete-kudeatzailea
+Name[fi]=Synaptic-pakettienhallinta
+Name[fr]=Gestionnaire de paquets Synaptic
+Name[gl]=Xestor de paquetes Synaptic
+Name[he]=מנהל החבילות Synaptic
+Name[hi]=सिनेप्टिक पैकेज प्रबन्धक
+Name[hu]=Synaptic csomagkezelő
+Name[ia]=Administrator de pacchettos Synaptic
+Name[id]=Synaptic Manajer Paket
+Name[it]=Gestore pacchetti
+Name[ja]=Synaptic パッケージマネージャ
+Name[ko]=시냅틱 패키지 관리자
+Name[ku]=Rêveberê Pakêtan Synaptic
+Name[lt]=Paketų tvarkyklė Synaptic
+Name[mk]=Менаџер за пакети - Синаптик
+Name[ms]=Pengurus Pakej Synaptic
+Name[nb]=Synaptic pakkebehandler
+Name[nl]=Synaptic Pakketbeheer
+Name[no]=Synaptic Pakkeadministrasjon
+Name[pl]=Synaptic Menedżer Pakietów
+Name[pt]=Gestor de Pacotes Synaptic
+Name[pt_BR]=Gerenciador de pacotes Synaptic
+Name[ro]=Synaptic - administrator de pachete
+Name[ru]=Менеджер пакетов Synaptic
+Name[sk]=Synaptic - správca balíkov
+Name[sl]=Upravljalnik paketov Synaptic
+Name[sr]=Синаптик — управник пакета
+Name[sr@Latn]=Upravnik paketa „Synaptic“
+Name[sv]=Pakethanteraren Synaptic
+Name[th]=เครื่องมือจัดการแพกเกจ Synaptic
+Name[tr]=Synaptic Paket Yöneticisi
+Name[uk]=Менеджер пакунків Synaptic
+Name[xh]=UMlawuli woMqulu we-Synaptic
+Name[zh_CN]=新立得软件包管理器
+Name[zh_TW]=Synaptic 套件管理程式
+GenericName=Package Manager
+GenericName[ar]=مدير الحزم
+GenericName[be]=Кіраўнік пакетамі
+GenericName[be@latin]=Kiraŭnik pakunkaŭ
+GenericName[bg]=Мениджър на пакети
+GenericName[br]=Merour pakadoù
+GenericName[bs]=Upravnik paketa
+GenericName[ca]=Gestor de paquets
+GenericName[ca@valencia]=Gestor de paquets
+GenericName[cs]=Správce balíků
+GenericName[da]=Pakkehåndteringsprogram
+GenericName[de]=Paketverwaltung
+GenericName[el]=Διαχείριση πακέτων
+GenericName[en_AU]=Package Manager
+GenericName[en_GB]=Package Manager
+GenericName[eo]=Pakaĵmastrumilo
+GenericName[es]=Gestor de paquetes
+GenericName[et]=Paketihaldur
+GenericName[eu]=Pakete-kudeatzailea
+GenericName[fi]=Pakettienhallinta
+GenericName[fr]=Gestionnaire de paquets
+GenericName[gl]=Xestor de paquetes
+GenericName[he]=מנהל חבילות
+GenericName[hi]=पैकेज प्रबन्धक
+GenericName[hu]=Csomagkezelő
+GenericName[ia]=Administrator de pacchettos
+GenericName[id]=Manajer Paket
+GenericName[it]=Gestore pacchetti
+GenericName[ja]=パッケージマネージャ
+GenericName[ko]=패키지 관리자
+GenericName[ku]=Rêveberê Pakêtan
+GenericName[lt]=Paketų tvarkyklė
+GenericName[mk]=Менаџер за пакети
+GenericName[ms]=Pengurusan Pakej
+GenericName[nb]=Pakkebehandler
+GenericName[nl]=Pakketbeheerder
+GenericName[pl]=Menedżer pakietów
+GenericName[pt]=Gestor de Pacotes
+GenericName[pt_BR]=Gerenciador de pacotes
+GenericName[ro]=Administrator de pachete
+GenericName[ru]=Менеджер пакетов
+GenericName[sk]=Správca balíkov
+GenericName[sl]=Upravljalnik paketov
+GenericName[sr]=Управник пакета
+GenericName[sr@Latn]=Upravnik paketa
+GenericName[sv]=Pakethanterare
+GenericName[th]=เครื่องมือจัดการแพกเกจ
+GenericName[tr]=Paket Yöneticisi
+GenericName[uk]=Менеджер пакунків
+GenericName[xh]=UMlawuli woMqulu
+GenericName[zh_CN]=软件包管理器
+GenericName[zh_TW]=套件管理程式
+Comment=Install, remove and upgrade software packages
+Comment[ar]=ثبّت، أزل وحدّث حزم البرامج
+Comment[be]=Усталёўвае, выдаляе і абнаўляе пакеты
+Comment[be@latin]=Instaluj, vydalaj i aktualizuj prahramnyja pakunki
+Comment[bg]=Инсталиране, премахване и актуализиране на софтуерни пакети
+Comment[bn]=সফটওয়্যার প্যাকেজ ইনস্টল, অপসারণ এবং আপগ্রেড
+Comment[br]=Staliañ, dilemel hag hizivaat meziantoù
+Comment[bs]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[ca]=Instal·la, elimina i actualitza paquets de programari
+Comment[ca@valencia]=Instal·la, elimina i actualitza paquets de programari
+Comment[cs]=Nainstalovat, odstranit a aktualizovat balíky
+Comment[da]=Installér, fjern og opgradér softwarepakker
+Comment[de]=Software-Pakete installieren, entfernen und aktualisieren
+Comment[el]=Εγκατάσταση, απομάκρυνση και αναβάθμιση πακέτων λογισμικού
+Comment[en_AU]=Install, remove and upgrade software packages
+Comment[en_GB]=Install, remove and upgrade software packages
+Comment[eo]=Instali, forigi kaj promocii programarajn pakaĵojn
+Comment[es]=Instalar, desinstalar y actualizar los paquetes de software
+Comment[et]=Paigalda, eemalda ja uuenda tarkvarapakette
+Comment[eu]=Instalatu, kendu eta bertsio-berritu software-paketeak
+Comment[fi]=Asenna, poista ja päivitä ohjelmistopaketteja
+Comment[fr]=Installer, désinstaller et mettre à jour les paquets de logiciels
+Comment[gl]=Instalar, retirar e anovar os paquetes de software
+Comment[he]=התקנה, הסרה ושדרוג חבילות תכנה.
+Comment[hi]=सॉफ्टवेयर पैकेजों की स्थापना, अद्यतन करें या उन्हें हटाएं.
+Comment[hu]=Csomagok telepítése, törlése és frissítése
+Comment[it]=Installa, rimuove e aggiorna i pacchetti software
+Comment[ja]=ソフトウェアパッケージのインストール、削除またはアップグレード
+Comment[ko]=소프트웨어 패키지를 설치, 지우기, 업그레이드
+Comment[ku]=Pakêtên nivîsbariyê saz bike, jê bibe û bilindbike
+Comment[lt]=Įdiekite, šalinkite ir atnaujinkite programų paketus
+Comment[mk]=Инсталирајте, отстранете или надградете софтверски пакети
+Comment[ms]=Pasang, buang dan tatar pakej perisian
+Comment[nb]=Installer, fjern eller oppgrader programpakker
+Comment[nl]=Softwarepakketten installeren, verwijderen en opwaarderen
+Comment[no]=Installer, fjern eller oppgrader programvare pakker
+Comment[pl]=Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem
+Comment[pt]=Instalar, remover e actualizar pacotes
+Comment[pt_BR]=Instalar, remover e atualizar pacotes de software
+Comment[ro]=Instalează, dezinstalează și actualizează pachete de programe
+Comment[ru]=Установить, удалить и обновить пакеты
+Comment[sk]=Inštalovať, odstrániť alebo aktualizovať softvérové balíky
+Comment[sl]=Namestitev, odstranjevanje in nadgradnja programskih paketov
+Comment[sr]=Инсталирајте, уклоните и надоградите пакете програма
+Comment[sr@Latn]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[sv]=Installera, ta bort och uppgradera programpaket
+Comment[th]=ติดตั้ง ถอดถอน และปรับรุ่นแพกเกจซอฟต์แวร์
+Comment[tr]=Paketleri kur, kaldır ya da yükselt
+Comment[uk]=Встановлення, вилучення та оновлення пакунків програмного забезпечення
+Comment[xh]=Faka, susa uze uphucule imiqulu yesoftware
+Comment[zh_CN]=安装，删除和升级软件包
+Comment[zh_TW]=安裝、移除及升級套件
+Exec=synaptic
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;System;
+X-TDE-SubstituteUID=true
+OnlyShowIn=TDE;
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop b/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
new file mode 100644
index 000000000..4a2c1f867
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+GenericName=Package Manager
+Comment=Install, remove and upgrade software packages
+Exec=synaptic-pkexec
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;GTK;System;Settings;
+NotShowIn=KDE;TDE;
+X-Ubuntu-Gettext-Domain=synaptic
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/install b/debian/squeeze/metapackages/synaptic-trinity/debian/install
new file mode 100644
index 000000000..4a167e5fa
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/install
@@ -0,0 +1,2 @@
+synaptic.desktop			usr/share/applications
+synaptic-tde.desktop			usr/share/applications
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
new file mode 100644
index 000000000..e6d06626a
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove \
+                /usr/share/applications/synaptic.desktop
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
new file mode 100644
index 000000000..eba99aba2
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    # remove old diversions if present
+    # add new diversion
+    dpkg-divert --package $package_name \
+    --divert /usr/share/applications/synaptic.desktop.distrib \
+    --rename /usr/share/applications/synaptic.desktop
+    ;;
+
+  upgrade)
+    # remove old diversion if present
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+        dpkg-divert --remove --package $package_name --rename "/usr/share/applications/synaptic.desktop"
+    fi
+
+    # add new diversion
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -z "$divert" ]; then
+        dpkg-divert --package $package_name \
+                    --divert /usr/share/applications/synaptic.desktop.distrib \
+                    --rename /usr/share/applications/synaptic.desktop
+    fi
+    ;;
+
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/rules b/debian/squeeze/metapackages/synaptic-trinity/debian/rules
new file mode 100755
index 000000000..187d68f00
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
+DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+	dh_testdir
+	[ -e debian/stamp-distrospecific ] || \
+	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+	tee debian/stamp-distrospecific | \
+	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
+
+binary-install/synaptic-trinity::
+	dh_testdir
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/source/format b/debian/squeeze/metapackages/synaptic-trinity/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/source/options b/debian/squeeze/metapackages/synaptic-trinity/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/squeeze/tdegraphics/debian/control b/debian/squeeze/tdegraphics/debian/control
index 22be8fdc0..ed9f0dd1e 100644
--- a/debian/squeeze/tdegraphics/debian/control
+++ b/debian/squeeze/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 282561b98..32320ba90 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -170,7 +170,7 @@ This package installs the Trinity directory structure.
 %post
 %if 0%{?suse_version}
 # Add setuid files in '/etc/permissions.local'
-for b in fileshareset kgrantpty kpac_dhcp_helper start_tdeinit; do
+for b in kgrantpty kpac_dhcp_helper start_tdeinit; do
   if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
     echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
   fi
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index 2ac162ece..4ec098bd9 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -1,36 +1,60 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdeaddons
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_pkg tdeaddons
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
 
-Name:		trinity-tdeaddons
+Name:		trinity-%{tde_pkg}
 Summary:	Trinity Desktop Environment - Plugins
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-License:	GPLv2
 Group:		User Interface/Desktops
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Obsoletes:	trinity-kdeaddons < %{version}-%{release}
 Provides:	trinity-kdeaddons = %{version}-%{release}
 Obsoletes:	trinity-kdeaddons-extras < %{version}-%{release}
@@ -42,9 +66,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-tdebase-devel >= %{tde_version}
 BuildRequires: trinity-tdegames-devel >= %{tde_version}
@@ -730,6 +751,7 @@ fi
   -DBUILD_NOATUN_PLUGINS=ON \
   -DBUILD_RENAMEDLG_PLUGINS=ON \
   -DBUILD_TDEFILE_PLUGINS=ON \
+  -DBUILD_TUTORIALS=OFF \
   ..
 
 %__make %{?_smp_mflags} || %__make
@@ -740,6 +762,16 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+# Temporary
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter
+
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file atlantikdesigner Game    BoardGame
+%suse_update_desktop_file -r ksig          Network Email
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 80dcff1ad..abc7828bc 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -56,7 +56,7 @@ BuildRequires:	nas-devel
 
 # LIBART support
 %define with_libart 1
-BuildRequires:	trinity-libart-lgpl-devel
+BuildRequires:	libart_lgpl-devel
 
 # XSCREENSAVER support
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 857654c63..1934eab27 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tdebase
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
 
 # TDE variables
 %define tde_version 14.0.0
+%define tde_pkg tdebase
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -34,17 +35,17 @@
 %endif
 
 
-Name:		trinity-tdebase
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:	Trinity Base Programs
-Group:		User Interface/Desktops
-URL:		http://www.trinitydesktop.org/
+Name:			trinity-%{tde_pkg}
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		Trinity Base Programs
+Group:			User Interface/Desktops
+URL:			http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
-License:	GPL-2.0+
+License:		GPL-2.0+
 %else
-License:	GPLv2+
+License:		GPLv2+
 %endif
 
 #Vendor:			Trinity Desktop
@@ -53,14 +54,14 @@ License:	GPLv2+
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
-Source2:	pamd.kdm-trinity%{?dist}
-Source3:	pamd.kdm-trinity-np%{?dist}
-Source4:	pamd.kcheckpass-trinity%{?dist}
-Source5:	pamd.kscreensaver-trinity%{?dist}
+Source2:		pamd.kdm-trinity%{?dist}
+Source3:		pamd.kdm-trinity-np%{?dist}
+Source4:		pamd.kcheckpass-trinity%{?dist}
+Source5:		pamd.kscreensaver-trinity%{?dist}
 %endif
 
 # openSUSE: configuration file for TDM
@@ -68,12 +69,12 @@ Source6:	suse-displaymanagers-tdm
 
 # Fedora 18: use SYSTEMD for TDM startup
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-Source7:	tdm.service%{?dist}
+Source7:		tdm.service%{?dist}
 %endif
 
 # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
 %if 0%{?suse_version} == 1140
-Source7:	xdm.oss114
+Source7:		xdm.oss114
 %endif
 
 # Fedora >= 17: special selinux policy required for TDM
@@ -401,11 +402,17 @@ BuildRequires:	lm_sensors-devel
 BuildRequires:	libsensors4-devel
 %endif
 
-# TSAK support (requires libudev-devel)
+# UDEV support (requires libudev)
 #  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_tsak 1
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libudev-devel
+%define with_tsak 1
+%define with_tdehwlib 1
+%endif
+
+# HAL support
+%if 0%{?rhel} == 5
+%define with_hal 1
 %endif
 
 # XRANDR support
@@ -3561,14 +3568,14 @@ fi
   -DWITH_LIBRAW1394=ON \
   -DWITH_SUDO_TDESU_BACKEND=OFF \
   -DWITH_PAM=ON \
-  -DWITH_SHADOW=ON \
+  -DWITH_SHADOW=OFF \
   -DWITH_XDMCP=ON \
   -DWITH_XINERAMA=ON \
   -DWITH_ARTS=ON \
   -DWITH_I8K=ON \
   -DWITH_SENSORS=ON \
-  -DWITH_HAL=OFF \
-  -DWITH_TDEHWLIB=ON \
+  %{?with_hal:-DWITH_HAL=ON} \
+  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
   -DWITH_ELFICON=OFF \
   -DWITH_UPOWER=ON \
   \
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 9dd69488c..8040e0aa5 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tdelibs
 #
-# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+# Copyright (c) 2014 Trinity Desktop Environment
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,16 +21,17 @@
 
 # TDE variables
 %define tde_version 14.0.0
+%define tde_pkg tdelibs
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -38,7 +39,7 @@
 %endif
 
 
-Name:			trinity-tdelibs
+Name:			trinity-%{tde_pkg}
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:		TDE Libraries
@@ -46,9 +47,9 @@ Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
-License:	GPL-2.0+
+License:		GPL-2.0+
 %else
-License:	GPLv2+
+License:		GPLv2+
 %endif
 
 #Vendor:			Trinity Desktop
@@ -58,7 +59,7 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
+Source1:		trinity-tdelibs-rpmlintrc
 
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
@@ -213,18 +214,6 @@ BuildRequires:	%{_lib}ltdl-devel
 BuildRequires:	libtool-ltdl-devel
 %endif
 
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
 # X11 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	x11-proto-devel
@@ -499,8 +488,11 @@ Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	libtqt4-devel = 2:4.2.0
 Requires:	trinity-arts-devel >= 2:1.5.10
 
+# ARTS support
+Requires:	trinity-arts-devel >= 2:1.5.10
+
 # LIBART_LGPL support
-Requires:	libart_lgpl-devel
+Requires:	libart_lgpl-devel >= 2.3.22
 
 # XT support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -509,6 +501,7 @@ Requires: libXt-devel
 
 # XCOMPOSITE support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%define 
 %if 0%{?mgaversion} >= 4
 Requires:	%{_lib}xcomposite-devel
 %else
@@ -607,6 +600,7 @@ fi
   %{?!with_pcre:-DWITH_PCRE=OFF} \
   %{?!with_inotify:-DWITH_INOTIFY=OFF} \
   %{?!with_gamin:-DWITH_GAMIN=OFF} \
+  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
   %{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \
   %{?with_hal:-DWITH_HAL=ON} \
   %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
@@ -621,6 +615,7 @@ fi
   %{?!with_lzma:-DWITH_LZMA=OFF} \
   -DWITH_LIBBFD=OFF \
   %{?!with_xrandr:-DWITH_XRANDR=OFF} \
+  -DWITH_XCOMPOSITE=ON \
   -DWITH_KDE4_MENU_SUFFIX=OFF \
   \
   -DWITH_ASPELL=ON \
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 86fc4171a..b8f25cd91 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1,42 +1,59 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdemultimedia
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
 
-# former extras bits
-%define _with_akode --with-akode
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
-%define _with_taglib --with-taglib
 
 Name:		trinity-tdemultimedia
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-License:	GPLv2
 Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,27 +69,33 @@ Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
 Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
 
 
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
-%if "%{?_with_akode}" != ""
+BuildRequires:	autoconf automake libtool m4
+
+# TAGLIB support
+%define _with_taglib --with-taglib
+BuildRequires: taglib-devel
+
+# AKODE support
+%define _with_akode --with-akode
 BuildRequires: trinity-akode-devel
 BuildRequires: trinity-akode-libmad
-%endif
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	zlib-devel
 
+# MUSICBRAINZ support
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
+#BuildRequires: libmusicbrainz-devel libtunepimp-devel
+
 # Audio libraries
 BuildRequires:	libvorbis-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	alsa-lib-devel 
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
-%{?_with_taglib:BuildRequires: taglib-devel}
 BuildRequires:	cdparanoia
 
 # CDDA support
@@ -1141,7 +1164,7 @@ noatun plugins.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -1208,6 +1231,21 @@ export PATH="%{tde_bindir}:${PATH}"
 # don't make these world-writeable
 chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file krec           AudioVideo Recorder
+%suse_update_desktop_file tdemid           AudioVideo Midi
+%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
+%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
+%suse_update_desktop_file kmix           AudioVideo Mixer
+%suse_update_desktop_file kaboodle       AudioVideo Player
+%suse_update_desktop_file kaudiocreator  AudioVideo CD
+%suse_update_desktop_file kscd           AudioVideo Player CD
+%suse_update_desktop_file noatun         AudioVideo Player Video
+%suse_update_desktop_file juk            AudioVideo Player Jukebox
+%suse_update_desktop_file audiocd
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index abf654c26..7d15ac589 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -45,20 +45,21 @@ Patch4:	c_cpp_reference-2.0.2-install.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 
+BuildRequires:	tqt3-apps-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
 Requires: make
 Requires: perl
 Requires: flex >= 2.5.4
-Requires:	trinity-tqt3-designer >= 3.5.0
-Requires:	trinity-tqt3-devel >= 3.5.0
+Requires:	tqt3-designer >= 3.5.0
+Requires:	libtqt3-mt-devel >= 3.5.0
 Requires: gettext
 Requires: ctags
 
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	db4-devel
 %endif
diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index c822e9a70..4ce314792 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -92,3 +92,14 @@ Description: transitional package for K3b's extra decoders [Trinity]
  This is a dummy transitional package to enable a smooth transition from
  libk3b2-extracodecs to libk3b3-extracodecs.
  It may safely be removed after installation.
+
+Package: k3b-trinity-dbg
+Priority: extra
+Architecture: any
+Depends: k3b-trinity (= ${binary:Version})
+Recommends: tdelibs-trinity-dbg
+Description: debugging symbols for K3b [Trinity]
+ This package provides debugging symbols for all binary packages built from
+ k3b source package. It's highly recommended to have this package installed
+ before reporting any K3b crashes to either K3b developers or Debian
+ package maintainers.
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index 52e98705d..5d3b3071d 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: k9copy-trinity
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
index aa29f908a..d6e517f1a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-ii-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity, synaptic-trinity
 Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
index 19b119f0f..5dd46298a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: redmond-default-settings-trinity
 Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity, synaptic-trinity
 Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control
index 469ac7768..fd7d2c627 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control.in b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
index 362d77f1d..45daafd86 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control.in
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- liblcms1-dev, libjpeg62-dev, pkg-config,
+ liblcms2-dev | liblcms1-dev, libjpeg62-dev, pkg-config,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
index f28c22b74..77ff6292d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, synaptic-trinity
 Recommends: tdeio-apt-trinity, tdepowersave-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gtk3-tqt-engine-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus-trinity, libreoffice-calc | openoffice.org-calc, libreoffice-impress | openoffice.org-impress, libreoffice-trinity | openoffice.org-trinity, libreoffice-writer | openoffice.org-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/changelog b/ubuntu/maverick/metapackages/synaptic-trinity/debian/changelog
new file mode 100644
index 000000000..176068d7f
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/changelog
@@ -0,0 +1,6 @@
+synaptic-trinity (2014.10.10-1) maverick; urgency=low
+
+  * NIGHTLY BUILDS
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Oct 2011 11:39:00 -0600
+
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/compat b/ubuntu/maverick/metapackages/synaptic-trinity/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/control b/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
new file mode 100644
index 000000000..9bacfcdca
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
@@ -0,0 +1,15 @@
+Source: synaptic-trinity
+Section: misc
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>=5.0), cdbs
+Standards-Version: 3.8.4
+
+Package: synaptic-trinity
+Priority: important
+Architecture: all
+Depends: synaptic
+Description: Synaptic for the Trinity Desktop Environment
+ This package allows Synaptic to be launched without manually typing
+ a gain-root command such as tdesu each time; instead tdesu will be
+ automatically used to launch synaptic if this package is installed.
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/copyright b/ubuntu/maverick/metapackages/synaptic-trinity/debian/copyright
new file mode 100644
index 000000000..d934ced33
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/copyright
@@ -0,0 +1,27 @@
+This is Debian GNU's GnuPG keyrings of archive keys.
+
+This package was originally put together by Michael Vogt
+<mvo@debian.org> 
+
+The keys in the keyrings don't fall under any copyright.  Everything
+else in the package is covered by the GNU GPL.
+
+Debian support files Copyright (C) 2006 Michael Vogt <mvo@debian.org> 
+based on the debian-keyring package maintained by James Troup 
+
+Debian support files for debian-archive-keyring are free software; you
+can redistribute them and/or modify them under the terms of the GNU
+General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.
+
+Debian support files for debian-archive-keyring are distributed in the
+hope that they will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU debian-archive-keyring source package as the file COPYING.
+If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301 USA.
+
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop b/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
new file mode 100644
index 000000000..7866d6869
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
@@ -0,0 +1,165 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+Name[ar]=مدير الحزم التشابكي
+Name[be]=Кіраўнік пакетаў Synaptic
+Name[be@latin]=Kiraŭnik pakunkaŭ Synaptic
+Name[bg]=Мениджър на пакети (Synaptic)
+Name[br]=Merour pakadoù Synaptic
+Name[bs]=Upravnik paketa „Synaptic“
+Name[ca]=Gestor de paquets Synaptic
+Name[ca@valencia]=Gestor de paquets Synaptic
+Name[cs]=Správce balíků Synaptic
+Name[da]=Synaptic - pakkehåndtering
+Name[de]=Synaptic-Paketverwaltung
+Name[el]=Διαχείριση πακέτων Synaptic
+Name[en_AU]=Synaptic Package Manager
+Name[en_GB]=Synaptic Package Manager
+Name[eo]=La pakaĵmastrumilo Sinaptiko
+Name[es]=Gestor de paquetes Synaptic
+Name[et]=Synaptic paketihaldur
+Name[eu]=Synaptic pakete-kudeatzailea
+Name[fi]=Synaptic-pakettienhallinta
+Name[fr]=Gestionnaire de paquets Synaptic
+Name[gl]=Xestor de paquetes Synaptic
+Name[he]=מנהל החבילות Synaptic
+Name[hi]=सिनेप्टिक पैकेज प्रबन्धक
+Name[hu]=Synaptic csomagkezelő
+Name[ia]=Administrator de pacchettos Synaptic
+Name[id]=Synaptic Manajer Paket
+Name[it]=Gestore pacchetti
+Name[ja]=Synaptic パッケージマネージャ
+Name[ko]=시냅틱 패키지 관리자
+Name[ku]=Rêveberê Pakêtan Synaptic
+Name[lt]=Paketų tvarkyklė Synaptic
+Name[mk]=Менаџер за пакети - Синаптик
+Name[ms]=Pengurus Pakej Synaptic
+Name[nb]=Synaptic pakkebehandler
+Name[nl]=Synaptic Pakketbeheer
+Name[no]=Synaptic Pakkeadministrasjon
+Name[pl]=Synaptic Menedżer Pakietów
+Name[pt]=Gestor de Pacotes Synaptic
+Name[pt_BR]=Gerenciador de pacotes Synaptic
+Name[ro]=Synaptic - administrator de pachete
+Name[ru]=Менеджер пакетов Synaptic
+Name[sk]=Synaptic - správca balíkov
+Name[sl]=Upravljalnik paketov Synaptic
+Name[sr]=Синаптик — управник пакета
+Name[sr@Latn]=Upravnik paketa „Synaptic“
+Name[sv]=Pakethanteraren Synaptic
+Name[th]=เครื่องมือจัดการแพกเกจ Synaptic
+Name[tr]=Synaptic Paket Yöneticisi
+Name[uk]=Менеджер пакунків Synaptic
+Name[xh]=UMlawuli woMqulu we-Synaptic
+Name[zh_CN]=新立得软件包管理器
+Name[zh_TW]=Synaptic 套件管理程式
+GenericName=Package Manager
+GenericName[ar]=مدير الحزم
+GenericName[be]=Кіраўнік пакетамі
+GenericName[be@latin]=Kiraŭnik pakunkaŭ
+GenericName[bg]=Мениджър на пакети
+GenericName[br]=Merour pakadoù
+GenericName[bs]=Upravnik paketa
+GenericName[ca]=Gestor de paquets
+GenericName[ca@valencia]=Gestor de paquets
+GenericName[cs]=Správce balíků
+GenericName[da]=Pakkehåndteringsprogram
+GenericName[de]=Paketverwaltung
+GenericName[el]=Διαχείριση πακέτων
+GenericName[en_AU]=Package Manager
+GenericName[en_GB]=Package Manager
+GenericName[eo]=Pakaĵmastrumilo
+GenericName[es]=Gestor de paquetes
+GenericName[et]=Paketihaldur
+GenericName[eu]=Pakete-kudeatzailea
+GenericName[fi]=Pakettienhallinta
+GenericName[fr]=Gestionnaire de paquets
+GenericName[gl]=Xestor de paquetes
+GenericName[he]=מנהל חבילות
+GenericName[hi]=पैकेज प्रबन्धक
+GenericName[hu]=Csomagkezelő
+GenericName[ia]=Administrator de pacchettos
+GenericName[id]=Manajer Paket
+GenericName[it]=Gestore pacchetti
+GenericName[ja]=パッケージマネージャ
+GenericName[ko]=패키지 관리자
+GenericName[ku]=Rêveberê Pakêtan
+GenericName[lt]=Paketų tvarkyklė
+GenericName[mk]=Менаџер за пакети
+GenericName[ms]=Pengurusan Pakej
+GenericName[nb]=Pakkebehandler
+GenericName[nl]=Pakketbeheerder
+GenericName[pl]=Menedżer pakietów
+GenericName[pt]=Gestor de Pacotes
+GenericName[pt_BR]=Gerenciador de pacotes
+GenericName[ro]=Administrator de pachete
+GenericName[ru]=Менеджер пакетов
+GenericName[sk]=Správca balíkov
+GenericName[sl]=Upravljalnik paketov
+GenericName[sr]=Управник пакета
+GenericName[sr@Latn]=Upravnik paketa
+GenericName[sv]=Pakethanterare
+GenericName[th]=เครื่องมือจัดการแพกเกจ
+GenericName[tr]=Paket Yöneticisi
+GenericName[uk]=Менеджер пакунків
+GenericName[xh]=UMlawuli woMqulu
+GenericName[zh_CN]=软件包管理器
+GenericName[zh_TW]=套件管理程式
+Comment=Install, remove and upgrade software packages
+Comment[ar]=ثبّت، أزل وحدّث حزم البرامج
+Comment[be]=Усталёўвае, выдаляе і абнаўляе пакеты
+Comment[be@latin]=Instaluj, vydalaj i aktualizuj prahramnyja pakunki
+Comment[bg]=Инсталиране, премахване и актуализиране на софтуерни пакети
+Comment[bn]=সফটওয়্যার প্যাকেজ ইনস্টল, অপসারণ এবং আপগ্রেড
+Comment[br]=Staliañ, dilemel hag hizivaat meziantoù
+Comment[bs]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[ca]=Instal·la, elimina i actualitza paquets de programari
+Comment[ca@valencia]=Instal·la, elimina i actualitza paquets de programari
+Comment[cs]=Nainstalovat, odstranit a aktualizovat balíky
+Comment[da]=Installér, fjern og opgradér softwarepakker
+Comment[de]=Software-Pakete installieren, entfernen und aktualisieren
+Comment[el]=Εγκατάσταση, απομάκρυνση και αναβάθμιση πακέτων λογισμικού
+Comment[en_AU]=Install, remove and upgrade software packages
+Comment[en_GB]=Install, remove and upgrade software packages
+Comment[eo]=Instali, forigi kaj promocii programarajn pakaĵojn
+Comment[es]=Instalar, desinstalar y actualizar los paquetes de software
+Comment[et]=Paigalda, eemalda ja uuenda tarkvarapakette
+Comment[eu]=Instalatu, kendu eta bertsio-berritu software-paketeak
+Comment[fi]=Asenna, poista ja päivitä ohjelmistopaketteja
+Comment[fr]=Installer, désinstaller et mettre à jour les paquets de logiciels
+Comment[gl]=Instalar, retirar e anovar os paquetes de software
+Comment[he]=התקנה, הסרה ושדרוג חבילות תכנה.
+Comment[hi]=सॉफ्टवेयर पैकेजों की स्थापना, अद्यतन करें या उन्हें हटाएं.
+Comment[hu]=Csomagok telepítése, törlése és frissítése
+Comment[it]=Installa, rimuove e aggiorna i pacchetti software
+Comment[ja]=ソフトウェアパッケージのインストール、削除またはアップグレード
+Comment[ko]=소프트웨어 패키지를 설치, 지우기, 업그레이드
+Comment[ku]=Pakêtên nivîsbariyê saz bike, jê bibe û bilindbike
+Comment[lt]=Įdiekite, šalinkite ir atnaujinkite programų paketus
+Comment[mk]=Инсталирајте, отстранете или надградете софтверски пакети
+Comment[ms]=Pasang, buang dan tatar pakej perisian
+Comment[nb]=Installer, fjern eller oppgrader programpakker
+Comment[nl]=Softwarepakketten installeren, verwijderen en opwaarderen
+Comment[no]=Installer, fjern eller oppgrader programvare pakker
+Comment[pl]=Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem
+Comment[pt]=Instalar, remover e actualizar pacotes
+Comment[pt_BR]=Instalar, remover e atualizar pacotes de software
+Comment[ro]=Instalează, dezinstalează și actualizează pachete de programe
+Comment[ru]=Установить, удалить и обновить пакеты
+Comment[sk]=Inštalovať, odstrániť alebo aktualizovať softvérové balíky
+Comment[sl]=Namestitev, odstranjevanje in nadgradnja programskih paketov
+Comment[sr]=Инсталирајте, уклоните и надоградите пакете програма
+Comment[sr@Latn]=Instaliraj, ukloni i nadogradi softverske pakete
+Comment[sv]=Installera, ta bort och uppgradera programpaket
+Comment[th]=ติดตั้ง ถอดถอน และปรับรุ่นแพกเกจซอฟต์แวร์
+Comment[tr]=Paketleri kur, kaldır ya da yükselt
+Comment[uk]=Встановлення, вилучення та оновлення пакунків програмного забезпечення
+Comment[xh]=Faka, susa uze uphucule imiqulu yesoftware
+Comment[zh_CN]=安装，删除和升级软件包
+Comment[zh_TW]=安裝、移除及升級套件
+Exec=synaptic
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;System;
+X-TDE-SubstituteUID=true
+OnlyShowIn=TDE;
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop b/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
new file mode 100644
index 000000000..4a2c1f867
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Synaptic Package Manager
+GenericName=Package Manager
+Comment=Install, remove and upgrade software packages
+Exec=synaptic-pkexec
+Icon=synaptic
+Terminal=false
+Type=Application
+Categories=PackageManager;GTK;System;Settings;
+NotShowIn=KDE;TDE;
+X-Ubuntu-Gettext-Domain=synaptic
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/install b/ubuntu/maverick/metapackages/synaptic-trinity/debian/install
new file mode 100644
index 000000000..4a167e5fa
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/install
@@ -0,0 +1,2 @@
+synaptic.desktop			usr/share/applications
+synaptic-tde.desktop			usr/share/applications
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
new file mode 100644
index 000000000..e6d06626a
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove \
+                /usr/share/applications/synaptic.desktop
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
new file mode 100644
index 000000000..eba99aba2
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    # remove old diversions if present
+    # add new diversion
+    dpkg-divert --package $package_name \
+    --divert /usr/share/applications/synaptic.desktop.distrib \
+    --rename /usr/share/applications/synaptic.desktop
+    ;;
+
+  upgrade)
+    # remove old diversion if present
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+        dpkg-divert --remove --package $package_name --rename "/usr/share/applications/synaptic.desktop"
+    fi
+
+    # add new diversion
+    divert=`dpkg-divert --listpackage "/usr/share/applications/synaptic.desktop"`
+    if [ -z "$divert" ]; then
+        dpkg-divert --package $package_name \
+                    --divert /usr/share/applications/synaptic.desktop.distrib \
+                    --rename /usr/share/applications/synaptic.desktop
+    fi
+    ;;
+
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/rules b/ubuntu/maverick/metapackages/synaptic-trinity/debian/rules
new file mode 100755
index 000000000..187d68f00
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
+DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+	dh_testdir
+	[ -e debian/stamp-distrospecific ] || \
+	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+	tee debian/stamp-distrospecific | \
+	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
+
+binary-install/synaptic-trinity::
+	dh_testdir
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/format b/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/options b/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
index 7f60cca1e..ff7f9a3fd 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
 
 Package: trinity-livecd
 Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, tdepowersave-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, tdepowersave-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, synaptic-trinity, trinity-keyring
 Recommends:
  kpresenter-trinity, kspread-trinity, kword-trinity,
  tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index b5c3622f3..601f51693 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity