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

40 files changed, 228 insertions, 877 deletions

diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/changelog b/debian/lenny/metapackages/synaptic-trinity/debian/changelog
deleted file mode 100644
index 176068d7f..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/control b/debian/lenny/metapackages/synaptic-trinity/debian/control
deleted file mode 100644
index 9bacfcdca..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index d934ced33..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 7866d6869..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
+++ /dev/null
@@ -1,165 +0,0 @@
-[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
deleted file mode 100644
index 4a2c1f867..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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
deleted file mode 100644
index 4a167e5fa..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 840ae090e..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/postrm
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=synaptic-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
deleted file mode 100644
index dc1ddc268..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/preinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=synaptic-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
deleted file mode 100755
index 187d68f00..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/rules
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/source/options b/debian/lenny/metapackages/synaptic-trinity/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/debian/lenny/metapackages/synaptic-trinity/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index 740f0b2ce..352f8c4b4 100644
--- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
@@ -401,21 +401,14 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/pysol.png
@@ -429,6 +422,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/abiword.png
@@ -456,7 +456,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/energy.png
@@ -480,7 +479,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkicker.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkwm.png
@@ -491,7 +489,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdmconfig.png
@@ -507,7 +504,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/multimedia.png
@@ -516,28 +512,20 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_application.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/panel_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/plan.png
@@ -574,6 +562,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xmms.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/access.png
@@ -607,13 +607,12 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/nedit.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/package_development.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/randr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/samba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/style.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/stylesheet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/preferences-desktop-personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/abiword.png
@@ -641,7 +640,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/energy.png
@@ -666,7 +664,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmkicker.png
@@ -678,7 +675,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdmconfig.png
@@ -694,7 +690,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/multimedia.png
@@ -702,27 +697,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pinguin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/planner.png
@@ -763,6 +750,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/x.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/abiword.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/access.png
@@ -786,7 +786,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/energy.png
@@ -810,7 +809,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
@@ -822,7 +820,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmscsi.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdmconfig.png
@@ -837,33 +834,24 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/proxy.png
@@ -890,6 +878,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xemacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xmag.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/access.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/acroread.png
@@ -933,22 +933,15 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/pysol.png
@@ -964,6 +957,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/laptop.png
 debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
 debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index 1b4d75580..1b1fb2ff0 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -21,8 +21,6 @@ Description: An IDE for Unix/X11
  .
  The application wizard can generate fully functional projects
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-doc
 Section: doc
@@ -39,8 +37,6 @@ Description: An IDE for Unix/X11 - documentation
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains documentation for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-data-trinity
 Architecture: all
@@ -56,8 +52,6 @@ Description: An IDE for Unix/X11 - data
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains arch independent data for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-dev
 Architecture: any
@@ -74,6 +68,16 @@ Description: An IDE for Unix/X11 - development files
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains development files for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
+
+Package: tdevelop-trinity-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Replaces: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Breaks: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Depends: tdevelop-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for tdevelop
+ This package contains the debugging symbols associated with tdevelop.
+ They will automatically be used by gdb for debugging tdevelop-related
+ issues.
 
diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index 690ea3c9b..fbc109e36 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/tdevelop/debian/rules
@@ -17,6 +17,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
+DEB_DH_STRIP_ARGS  := --dbg-package=tdevelop-trinity-dbg
+
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/changelog b/debian/squeeze/metapackages/synaptic-trinity/debian/changelog
deleted file mode 100644
index 176068d7f..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/control b/debian/squeeze/metapackages/synaptic-trinity/debian/control
deleted file mode 100644
index 9bacfcdca..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index d934ced33..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 7866d6869..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
+++ /dev/null
@@ -1,165 +0,0 @@
-[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
deleted file mode 100644
index 4a2c1f867..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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
deleted file mode 100644
index 4a167e5fa..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 840ae090e..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=synaptic-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
deleted file mode 100644
index dc1ddc268..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=synaptic-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
deleted file mode 100755
index 187d68f00..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/rules
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/source/options b/debian/squeeze/metapackages/synaptic-trinity/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
index 740f0b2ce..352f8c4b4 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
@@ -401,21 +401,14 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/pysol.png
@@ -429,6 +422,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/abiword.png
@@ -456,7 +456,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/energy.png
@@ -480,7 +479,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkicker.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkwm.png
@@ -491,7 +489,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdmconfig.png
@@ -507,7 +504,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/multimedia.png
@@ -516,28 +512,20 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_application.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/panel_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/plan.png
@@ -574,6 +562,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xmms.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/access.png
@@ -607,13 +607,12 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/nedit.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/package_development.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/randr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/samba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/style.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/stylesheet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/preferences-desktop-personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/abiword.png
@@ -641,7 +640,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/energy.png
@@ -666,7 +664,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmkicker.png
@@ -678,7 +675,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdmconfig.png
@@ -694,7 +690,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/multimedia.png
@@ -702,27 +697,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pinguin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/planner.png
@@ -763,6 +750,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/x.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/abiword.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/access.png
@@ -786,7 +786,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/energy.png
@@ -810,7 +809,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
@@ -822,7 +820,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmscsi.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdmconfig.png
@@ -837,33 +834,24 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/proxy.png
@@ -890,6 +878,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xemacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xmag.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/access.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/acroread.png
@@ -933,22 +933,15 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/pysol.png
@@ -964,6 +957,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/laptop.png
 debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
 debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control
index 1b4d75580..1b1fb2ff0 100644
--- a/debian/squeeze/tdevelop/debian/control
+++ b/debian/squeeze/tdevelop/debian/control
@@ -21,8 +21,6 @@ Description: An IDE for Unix/X11
  .
  The application wizard can generate fully functional projects
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-doc
 Section: doc
@@ -39,8 +37,6 @@ Description: An IDE for Unix/X11 - documentation
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains documentation for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-data-trinity
 Architecture: all
@@ -56,8 +52,6 @@ Description: An IDE for Unix/X11 - data
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains arch independent data for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-dev
 Architecture: any
@@ -74,6 +68,16 @@ Description: An IDE for Unix/X11 - development files
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains development files for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
+
+Package: tdevelop-trinity-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Replaces: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Breaks: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Depends: tdevelop-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for tdevelop
+ This package contains the debugging symbols associated with tdevelop.
+ They will automatically be used by gdb for debugging tdevelop-related
+ issues.
 
diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules
index ced683e05..c484f3f2c 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/tdevelop/debian/rules
@@ -17,6 +17,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
+DEB_DH_STRIP_ARGS  := --dbg-package=tdevelop-trinity-dbg
+
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
index dc1ddc268..209296dbd 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
@@ -19,19 +19,6 @@ case "$1" in
     ;;
 
   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)
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index b6fb834e0..79aebbd1d 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -1,7 +1,9 @@
---- tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:43.361137168 +0000
-+++ tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:51.972827992 +0000
-@@ -103,3 +103,4 @@
- InitialPreference=8
+diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
+index dd64b58..0af3e44 100644
+--- a/kate/data/kwrite.desktop
++++ b/kate/data/kwrite.desktop
+@@ -109,3 +109,4 @@ Terminal=false
+ X-TDE-InitialPreference=8
  X-DCOP-ServiceType=Multi
  Categories=Qt;TDE;TextEditor;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 405e2c052..608802a75 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:16.506855480 +0000
-+++ tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:22.186991968 +0000
-@@ -45,3 +45,4 @@
+diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
+index 6003b68..f33e1f4 100644
+--- a/knetattach/knetattach.desktop
++++ b/knetattach/knetattach.desktop
+@@ -80,3 +80,4 @@ Terminal=false
  X-TDE-StartupNotify=true
  Categories=Qt;TDE;Network;
- DocPath=knetattach/index.html
+ X-DocPath=knetattach/index.html
 +OnlyShowIn=Old;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index 1ecc9f46f..c934da2d5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -1,9 +1,9 @@
-Index: b/kicker/kicker/kcmkicker.desktop
-===================================================================
+diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop
+index c7d4939..fd8b513 100644
 --- a/kicker/kicker/kcmkicker.desktop
 +++ b/kicker/kicker/kcmkicker.desktop
-@@ -79,3 +79,4 @@
- DocPath=kicker/configuring.html
+@@ -79,3 +79,4 @@ X-TDE-StartupNotify=true
+ X-DocPath=kicker/configuring.html
  OnlyShowIn=TDE;
  Categories=Qt;TDE;Settings;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index e6228a283..009d6f9db 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -1,9 +1,9 @@
-Index: b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-===================================================================
+diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+index 5d5e2b8..c989adf 100644
 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
 +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -99,3 +99,4 @@
- InitialPreference=1
+@@ -99,3 +99,4 @@ Terminal=false
+ X-TDE-InitialPreference=1
  Categories=Qt;TDE;Graphics;
- DocPath=tdefontview/index.html
+ X-DocPath=tdefontview/index.html
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index 8efaadcab..607457c94 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -1,9 +1,10 @@
-diff -Nur tdebase-3.5.4/tdeprint/printmgr/printers.desktop tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop
---- tdebase-3.5.4/tdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
-+++ tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
-@@ -219,4 +219,4 @@
- Keywords[zh_TW]=print,printer,printing management,列印,印表機,列印管理
- Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
+diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.desktop
+index f4a363d..f990394 100644
+--- a/tdeprint/printmgr/printers.desktop
++++ b/tdeprint/printmgr/printers.desktop
+@@ -233,4 +233,4 @@ Keywords[zh_CN]=print;printer;printing management;打印;打印机;打印管理
+ Keywords[zh_TW]=print;printer;printing management;列印;印表機;列印管理
+ Keywords[zu]=shicilela;umshicileli;abaphathi boshicilelo
  
 -Categories=Qt;TDE;X-TDE-settings-hardware;Settings;
 +Categories=Qt;TDE;X-TDE-settings-hardware;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index ae8e9141a..0e0627870 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
@@ -1,9 +1,10 @@
 diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
+index fdd1d41..e6913a7 100644
 --- a/kcontrol/componentchooser/componentchooser.desktop
 +++ b/kcontrol/componentchooser/componentchooser.desktop
 @@ -6,6 +6,7 @@ X-TDE-Library=componentchooser
  X-TDE-ParentApp=kcontrol
- DocPath=kcontrol/componentchooser/index.html
+ X-DocPath=kcontrol/componentchooser/index.html
  Categories=Qt;TDE;X-TDE-settings-components;
 +NoDisplay=true
  
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 740f0b2ce..352f8c4b4 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -401,21 +401,14 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/pysol.png
@@ -429,6 +422,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/abiword.png
@@ -456,7 +456,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/energy.png
@@ -480,7 +479,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkicker.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmkwm.png
@@ -491,7 +489,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdmconfig.png
@@ -507,7 +504,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/multimedia.png
@@ -516,28 +512,20 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_application.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/panel_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/plan.png
@@ -574,6 +562,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xmms.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/access.png
@@ -607,13 +607,12 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kthememgr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/locale.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/nedit.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/package_development.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/randr.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/samba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/style.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/stylesheet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/preferences-desktop-personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/newfont.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/abiword.png
@@ -641,7 +640,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/energy.png
@@ -666,7 +664,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmkicker.png
@@ -678,7 +675,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmscsi.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsound.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdmconfig.png
@@ -694,7 +690,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linguist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/lyx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/mathematica.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/multimedia.png
@@ -702,27 +697,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/pinguin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/planner.png
@@ -763,6 +750,19 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xosview.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xpaint.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/x.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/abiword.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/access.png
@@ -786,7 +786,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/eclipse.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_languages.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_mathematics.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/edu_science.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/emacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/email.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/energy.png
@@ -810,7 +809,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/hwinfo.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/icons.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/iconthemes.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/ieee1394.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/input_devices_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdevices.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
@@ -822,7 +820,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmpci.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmprocessor.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmscsi.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmsystem.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmx.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcontrol.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdmconfig.png
@@ -837,33 +834,24 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/opera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_editors.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_edutainment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_favourite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_arcade.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_board.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_card.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_games_strategy.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_graphics.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_utilities.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/package_wordprocessing.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/pan.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/planner.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/proxy.png
@@ -890,6 +878,18 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xemacs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xmag.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/xv.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-graphics.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-office.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-science.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-peripherals.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-desktop.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/categories/preferences-system.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/laptop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/access.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/acroread.png
@@ -933,22 +933,15 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kvirc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/licq.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/linuxconf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/locale.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/looknfeel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/multimedia.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/nedit.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/netscape.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_applications.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_development.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_favourite.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_games.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_multimedia.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_network.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_settings.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_toys.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/package_utilities.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/penguin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/personal.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/phppg.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/proxy.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/pysol.png
@@ -964,6 +957,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/wp.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xclock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xfmail.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/xmag.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-development.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-games.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-internet.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-multimedia.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/applications-utilities.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop-personal.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/categories/preferences-desktop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/laptop.png
 debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
 debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index 9eee97afc..53920834b 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -21,8 +21,6 @@ Description: An IDE for Unix/X11
  .
  The application wizard can generate fully functional projects
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-doc
 Section: doc
@@ -39,8 +37,6 @@ Description: An IDE for Unix/X11 - documentation
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains documentation for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-data-trinity
 Architecture: all
@@ -56,8 +52,6 @@ Description: An IDE for Unix/X11 - data
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains arch independent data for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
 
 Package: tdevelop-trinity-dev
 Architecture: any
@@ -74,6 +68,16 @@ Description: An IDE for Unix/X11 - development files
  for terminal programs and GUI programs using TQt, Qt, TDE, KDE or GNOME.
  .
  This package contains development files for TDevelop.
- .
-  Homepage: http://www.tdevelop.org/
+
+Package: tdevelop-trinity-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Replaces: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Breaks: kdevelop-trinity-dbg (<< 4:14.0.0~)
+Depends: tdevelop-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for tdevelop
+ This package contains the debugging symbols associated with tdevelop.
+ They will automatically be used by gdb for debugging tdevelop-related
+ issues.
 
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index ced683e05..c484f3f2c 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -17,6 +17,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
+DEB_DH_STRIP_ARGS  := --dbg-package=tdevelop-trinity-dbg
+
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)