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

11 files changed, 58 insertions, 62 deletions

diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
index 8ee3c9256..d34eea39d 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
@@ -28,9 +28,7 @@ debian/tmp/opt/trinity/share/apps/kdesktop/patterns/stonewall2.desktop
 debian/tmp/opt/trinity/share/apps/kdesktop/patterns/stonewall2.png
 debian/tmp/opt/trinity/share/apps/kdesktop/patterns/triangles.desktop
 debian/tmp/opt/trinity/share/apps/kdesktop/patterns/triangles.png
-debian/tmp/opt/trinity/share/apps/kdesktop/pics/kde2.xbm
 debian/tmp/opt/trinity/share/apps/kdesktop/pics/ksslogo.png
-debian/tmp/opt/trinity/share/apps/kdesktop/pics/splash2.png
 debian/tmp/opt/trinity/share/apps/kdesktop/pics/splash.png
 debian/tmp/opt/trinity/share/apps/kdesktop/programs/kwebdesktop.desktop
 debian/tmp/opt/trinity/share/apps/kdesktop/programs/xearth.desktop
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index f2fe725b2..5cf82b23e 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -19,7 +19,6 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/faq.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/info.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kcontrolmodules.desktop
-debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kicmodules.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/kioslaves.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/konqplugins.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/links.desktop
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
index 59d8b8988..debc5fc3a 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
@@ -3,5 +3,5 @@
 @@ -151,3 +151,4 @@
  GenericName[zu]=Amafayela Omuntu siqu
  Categories=Qt;KDE;Core;
- OnlyShowIn=KDE;
+ OnlyShowIn=TDE;
 +NoDisplay=true
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 06c51211c..f804ec536 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
@@ -2,6 +2,6 @@
 +++ tdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:30.907591016 +0000
 @@ -67,3 +67,4 @@
  X-KDE-StartupNotify=true
- OnlyShowIn=KDE;
+ OnlyShowIn=TDE;
  Categories=Qt;KDE;Settings;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 1ddb4bb54..b5e8922fb 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -3,5 +3,5 @@
 @@ -77,3 +77,4 @@
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Settings;
- OnlyShowIn=KDE;
+ OnlyShowIn=TDE;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
index 620302912..0f6d1eb53 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
@@ -3,5 +3,5 @@
 @@ -90,3 +90,4 @@
  Terminal=false
  X-DCOP-ServiceType=Multi
- Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
+ Categories=Qt;KDE;Utility
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 39aed9fb0..15bc95d83 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -2,6 +2,6 @@
 +++ tdebase-3.5.7/kfind/Kfind.desktop
 @@ -73,3 +73,4 @@
  X-KDE-StartupNotify=true
- OnlyShowIn=KDE;
+ OnlyShowIn=TDE;
  Categories=Qt;KDE;Core;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 78c8e1988..4ec458164 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -226,10 +226,10 @@ binary-install/tdebase-data-trinity::
 	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
 	# it's in fact a linux specific file...
 	install -p -D -m644 kcontrol/view1394/oui.db debian/tdebase-data-trinity/opt/trinity/share/apps/kcmview1394/oui.db
-	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/kde-essential.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-information.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-screensavers.menu
-	install -p -D -m644 debian/tmp/etc/xdg/menus/kde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-settings.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/tde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/tde-essential.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/tde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-information.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/tde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-screensavers.menu
+	install -p -D -m644 debian/tmp/etc/xdg/menus/tde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-settings.menu
 	rm -rf debian/tmp/etc/xdg/*
 	rm -rf debian/tdebase-data-trinity/etc/xdg/*
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
index 87dc6edc8..9c62c3209 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 
-FILE="/etc/xdg/menus/kde-applications-merged/kde-essential.menu"
+FILE="/etc/xdg/menus/kde-applications-merged/tde-essential.menu"
 SUBDIR="/etc/xdg/menus/kde-applications-merged"
 
 case "$1" in
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
index e906f3a3f..4521c6f2d 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
@@ -1,50 +1,50 @@
-debian/tmp/opt/trinity/share/desktop-directories/kde-development.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-development-translation.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-development-webdevelopment.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-editors.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-edutainment.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-arcade.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-board.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-card.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-kids.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-roguelikes.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-games-strategy.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-graphics.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-information.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-internet.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-internet-terminal.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-main.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-more.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-multimedia.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-office.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-science.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-accessibility.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-components.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-desktop.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-hardware.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-looknfeel.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settingsmenu.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-network.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-peripherals.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-power.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-security.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-sound.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-system.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-settings-webbrowsing.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-system.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-system-screensavers.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-system-terminal.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-toys.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-unknown.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-accessibility.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-desktop.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-file.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-peripherals.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-pim.directory
-debian/tmp/opt/trinity/share/desktop-directories/kde-utilities-xutils.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-development.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-development-translation.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-development-webdevelopment.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-editors.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-edutainment.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-arcade.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-board.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-card.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-kids.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-roguelikes.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-games-strategy.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-graphics.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-information.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-internet.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-internet-terminal.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-main.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-more.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-multimedia.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-office.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-science.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-accessibility.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-components.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-desktop.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-hardware.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-looknfeel.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settingsmenu.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-network.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-peripherals.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-power.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-security.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-sound.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-system.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-settings-webbrowsing.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-system.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-system-screensavers.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-system-terminal.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-toys.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-unknown.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-accessibility.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-desktop.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-file.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-peripherals.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-pim.directory
+debian/tmp/opt/trinity/share/desktop-directories/tde-utilities-xutils.directory
 debian/tmp/opt/trinity/share/locale/l10n/ad/entry.desktop
 debian/tmp/opt/trinity/share/locale/l10n/ad/flag.png
 debian/tmp/opt/trinity/share/locale/l10n/ae/entry.desktop
@@ -574,4 +574,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksplash.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksplash.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksplash.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksplash.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ksplash.png
\ No newline at end of file
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ksplash.png
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
index 289fa03af..fd1aff663 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
@@ -12,7 +12,6 @@ debian/tmp/opt/trinity/bin/tdm_config
 debian/tmp/opt/trinity/bin/tdmctl
 debian/tmp/opt/trinity/bin/tdm_greet
 debian/tmp/opt/trinity/bin/krootimage
-debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png