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

7 files changed, 82 insertions, 76 deletions

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