DEB: use _base folder for a distro instead of specific distros (squeeze

and maverick).

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

21 files changed, 0 insertions, 279 deletions

diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff
deleted file mode 100644
index 45798364e..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tdm/config.def
-+++ b/tdm/config.def
-@@ -2644,9 +2644,9 @@
- 
- Key: UseTheme
- Type: bool
--Default: true
-+Default: false
- User: greeter
--Instance: */true
-+Instance: #*/true
- Comment: &
- Description:
-  Whether the greeter should be themed.
- 
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
deleted file mode 100644
index 598cd7092..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/starttde
-+++ b/starttde
-@@ -288,17 +288,17 @@
-   . "$tdehome/share/config/startupconfig"
- fi
- 
--# Make sure a default wallpaper is set.
--if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
-- # With Trinity this file should exist, but test first.
--  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
--cat >"$tdehome/share/config/kdesktoprc" <<EOF
--[Desktop0]
--Wallpaper=Trinity-lineart.svg
--WallpaperMode=Scaled
--EOF
--  fi
--fi
-+## Make sure a default wallpaper is set.
-+#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
-+# # With Trinity this file should exist, but test first.
-+#  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
-+#cat >"$tdehome/share/config/kdesktoprc" <<EOF
-+#[Desktop0]
-+#Wallpaper=Trinity-lineart.svg
-+#WallpaperMode=Scaled
-+#EOF
-+#  fi
-+#fi
- 
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
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
deleted file mode 100644
index 79aebbd1d..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-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_06_hide_home_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
deleted file mode 100644
index aa97a6a24..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/konqueror/Home.desktop-orig	2005-03-17 02:27:51.835213072 +0000
-+++ tdebase/konqueror/Home.desktop	2005-03-17 02:27:58.766159408 +0000
-@@ -151,3 +151,4 @@
- GenericName[zu]=Amafayela Omuntu siqu
- Categories=Qt;TDE;Core;
- OnlyShowIn=TDE;
-+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
deleted file mode 100644
index 608802a75..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
- 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
deleted file mode 100644
index c934da2d5..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-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 @@ 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_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
deleted file mode 100644
index 0bbb613a9..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kpersonalizer/kpersonalizer.desktop-orig	2005-03-17 01:05:16.091600616 +0000
-+++ tdebase/kpersonalizer/kpersonalizer.desktop	2005-03-17 01:05:23.678447240 +0000
-@@ -77,3 +77,4 @@
- X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;Settings;
- OnlyShowIn=TDE;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
deleted file mode 100644
index 878800634..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kmenuedit/kmenuedit.desktop-orig	2005-03-17 01:06:56.707304704 +0000
-+++ tdebase/kmenuedit/kmenuedit.desktop	2005-03-17 01:07:22.785340240 +0000
-@@ -82,3 +82,4 @@
- 
- X-DCOP-ServiceType=Unique
- Categories=Qt;TDE;Settings;
-+OnlyShowIn=Old;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
deleted file mode 100644
index ad3284bbb..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:26.659629872 +0000
-+++ tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:34.189485160 +0000
-@@ -80,3 +80,4 @@
- GenericName[zh_TW]=選單更新工具
- X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;Settings;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
deleted file mode 100644
index 9dfccdbd7..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: b/konsole/konsolesu.desktop
-===================================================================
---- a/konsole/konsolesu.desktop
-+++ b/konsole/konsolesu.desktop
-@@ -82,3 +82,4 @@
- GenericName[zh_TW]=終端機程式 - 超級使用者模式
- X-TDE-AuthorizeAction=shell_access
- Categories=Qt;TDE;X-TDE-System-su;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
deleted file mode 100644
index e12245486..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: b/konqueror/konquerorsu.desktop
-===================================================================
---- a/konqueror/konquerorsu.desktop
-+++ b/konqueror/konquerorsu.desktop
-@@ -88,3 +88,4 @@
- 
- Categories=Qt;TDE;X-TDE-System-su;
- OnlyShowIn=TDE;
-+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
deleted file mode 100644
index 009d6f9db..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-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 @@ Terminal=false
- X-TDE-InitialPreference=1
- Categories=Qt;TDE;Graphics;
- X-DocPath=tdefontview/index.html
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
deleted file mode 100644
index 3eab104cb..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kpager/kpager.desktop
-+++ tdebase/kpager/kpager.desktop
-@@ -96,3 +96,4 @@
- X-TDE-StartupNotify=false
- X-DCOP-ServiceType=Unique
- Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
deleted file mode 100644
index bfd5fd2af..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/klipper/klipper.desktop
-+++ tdebase/klipper/klipper.desktop
-@@ -143,3 +143,4 @@
- Comment[zh_CN]=剪贴历史工具
- Comment[zh_TW]=剪貼紀錄公用程式
- 
-+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
deleted file mode 100644
index a46ab143c..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
-+++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
-@@ -90,3 +90,4 @@
- Terminal=false
- X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
deleted file mode 100644
index dddb101e6..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kcontrol/display/display.desktop
-+++ tdebase/kcontrol/display/display.desktop
-@@ -135,3 +135,4 @@
- Comment[zh_CN]=显示设置
- Comment[zh_TW]=顯示設定
- Categories=Qt;TDE;X-TDE-settings-hardware;
-+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
deleted file mode 100644
index d2ff6732f..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-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_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
deleted file mode 100644
index baeb8bfd5..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tdm/kfrontend/tdmshutdown.cpp
-+++ b/tdm/kfrontend/tdmshutdown.cpp
-@@ -472,7 +472,7 @@
- {
- 	setCaption(i18n("Shutdown TDE"));
- 
--	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
- 
- 	TQFrame* lfrm = new TQFrame( this );
- 	TQHBoxLayout* hbuttonbox;
---- a/ksmserver/shutdowndlg.cpp
-+++ b/ksmserver/shutdowndlg.cpp
-@@ -697,7 +697,7 @@
- 							2 * KDialog::spacingHint() );
- 
- 	// default factor
--	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);
- 
- 	// slighty more space for the new logout
- 	int factor = 2;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
deleted file mode 100644
index 8db1221a5..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase-3.5.7/kfind/Kfind.desktop
-+++ tdebase-3.5.7/kfind/Kfind.desktop
-@@ -73,3 +73,4 @@
- X-TDE-StartupNotify=true
- OnlyShowIn=TDE;
- Categories=Qt;TDE;Core;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
deleted file mode 100644
index c312b6fb7..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- tdebase-3.5.8/tdm/backend/dm.c	2008-02-13 23:59:17.000000000 +0200
-+++ tdebase-3.5.8/tdm/backend/dm.c	2008-02-14 11:22:41.000000000 +0200
-@@ -996,9 +996,14 @@ ReapChildren( void )
- 				/* don't kill again */
- 				break;
- 			case running:
--				if (startingServer == d && d->serverStatus != ignore) {
--					if (d->serverStatus == starting && waitCode( status ) != 47)
--						LogError( "X server died during startup\n" );
-+				LogError("X server terminated: [%d, %d, %d]\n",
-+					(startingServer == d),
-+					(d->serverStatus),
-+					(waitCode(status)));
-+
-+				if (startingServer == d /*&& d->serverStatus != ignore*/) {
-+					if (/*d->serverStatus == starting &&*/ waitCode( status ) != 47)
-+					LogError( "X server died during startup\n" );
- 					StartServerFailed();
- 					break;
- 				}
---- tdebase-3.5.8/tdm/backend/server.c	2008-02-13 23:59:17.000000000 +0200
-+++ tdebase-3.5.8/tdm/backend/server.c	2008-02-14 11:41:20.000000000 +0200
-@@ -48,6 +48,10 @@ from the copyright holder.
- struct display *startingServer;
- time_t serverTimeout = TO_INF;
- 
-+#define SERVER_ATTEMPTS 3
-+
-+char* failsafeXServer[] = {"/etc/gdm/failsafeXServer", 0};
-+
- char **
- PrepServerArgv( struct display *d, const char *args )
- {
-@@ -128,6 +132,7 @@ StartServer( struct display *d )
- {
- 	startingServer = d;
- 	d->startTries = 0;
-+	d->serverAttempts = SERVER_ATTEMPTS;
- 	StartServerOnce();
- }
- 
-@@ -150,6 +155,7 @@ void
- StartServerSuccess()
- {
- 	struct display *d = startingServer;
-+	LogError("StartServerSucces\n");
- 	d->serverStatus = ignore;
- 	serverTimeout = TO_INF;
- 	Debug( "X server ready, starting session\n" );
-@@ -161,9 +167,14 @@ StartServerFailed()
- {
- 	struct display *d = startingServer;
- 	if (!d->serverAttempts || d->startTries < d->serverAttempts) {
-+		LogError("Failed to start X server. Starting failsafe X server.\n");
-+
-+		runAndWait(failsafeXServer, 0);
-+
- 		d->serverStatus = pausing;
- 		serverTimeout = d->openDelay + now;
- 	} else {
-+		LogError("StartServerFailed\n");
- 		d->serverStatus = ignore;
- 		serverTimeout = TO_INF;
- 		startingServer = 0;
diff --git a/ubuntu/maverick/tdebase/debian/patches/series b/ubuntu/maverick/tdebase/debian/patches/series
deleted file mode 100644
index cdb61694a..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/series
+++ /dev/null
@@ -1,20 +0,0 @@
-disable_default_tdm_theme.diff
-disable_starttde_wallpaper.diff
-kubuntu_04_hide_menu_entries.diff
-kubuntu_06_hide_home_menu_entry.diff
-kubuntu_07_hide_knetattach_menu_entry.diff
-kubuntu_08_hide_kcmkicker_menu_entry.diff
-kubuntu_09_hide_kpersonaliser_menu_entry.diff
-kubuntu_10_hide_kmenuedit_menu_entry.diff
-kubuntu_11_hide_kappfinder_menu_entry.diff
-kubuntu_13_hide_konsolesu_menu_entry.diff
-kubuntu_14_hide_konquerorsu_menu_entry.diff
-kubuntu_15_hide_tdefontview_menu_entry.diff
-kubuntu_16_hide_kpager_menu_entry.diff
-kubuntu_35_hide_klipper_menu_entry.diff
-kubuntu_37_hide_tdeprintfax_menu_entry.diff
-kubuntu_48_hide_display.diff
-kubuntu_70_hide_printers_desktop.diff
-kubuntu_89_new_logout_ui.diff
-kubuntu_9904_hide_kfind.diff
-kubuntu_9921_tdm_bulletproof_x.diff