Update Debian and Ubuntu tdebase packaging for icons update

diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index 740f0b2..352f8c4 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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
 ** Diff limit reached (max: 250 lines) **