RPM Packaging: update packages R14

14 files changed, 332 insertions, 2 deletions

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,