Housekeeping in Debian and Ubuntu

21 files changed, 0 insertions, 265 deletions

diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_tdm_theme.diff
deleted file mode 100644
index 200843f01..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/disable_default_tdm_theme.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- tdm/config.def
-+++ tdm/config.def
-@@ -2614,18 +2614,18 @@
- 
- Key: UseTheme
- Type: bool
--Default: true
-+Default: false
- User: greeter
--Instance: */true
-+Instance: #*/true
- Comment: &
- Description:
-  Whether the greeter should be themed.
- 
- Key: Theme
- Type: string
--Default: TDMDATA "/themes/o2_enterprise"
-+Default: ""
- User: greeter
--Instance: */TDMDATA "/themes/o2_enterprise"
-+Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
- Comment: &
- Description:
-  The theme to use for the greeter. Can point to either a directory or an XML
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick_automake/kdebase/debian/patches/disable_startkde_wallpaper.diff
deleted file mode 100644
index 838bbec11..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- startkde
-+++ startkde
-@@ -184,17 +184,17 @@
-   . $kdehome/share/config/startupconfig
- fi
- 
--# Make sure a default wallpaper is set.
--if [ ! -e $kdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
--  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
--cat >$kdehome/share/config/kdesktoprc <<EOF
--[Desktop0]
--Wallpaper=isadora.png
--WallpaperMode=Scaled
--EOF
--  fi
--fi
-+## Make sure a default wallpaper is set.
-+#if [ ! -e $kdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
-+#  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-+#cat >$kdehome/share/config/kdesktoprc <<EOF
-+#[Desktop0]
-+#Wallpaper=isadora.png
-+#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_automake/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
deleted file mode 100644
index 5fca9c324..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kate/data/kwrite.desktop	2005-03-17 02:30:43.361137168 +0000
-+++ kdebase/kate/data/kwrite.desktop	2005-03-17 02:30:51.972827992 +0000
-@@ -103,3 +103,4 @@
- InitialPreference=8
- X-DCOP-ServiceType=Multi
- Categories=Qt;KDE;TextEditor;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
deleted file mode 100644
index b9fe3609a..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/konqueror/Home.desktop-orig	2005-03-17 02:27:51.835213072 +0000
-+++ kdebase/konqueror/Home.desktop	2005-03-17 02:27:58.766159408 +0000
-@@ -151,3 +151,4 @@
- GenericName[zu]=Amafayela Omuntu siqu
- Categories=Qt;KDE;Core;
- OnlyShowIn=KDE;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
deleted file mode 100644
index 6768121dd..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/knetattach/knetattach.desktop	2005-03-17 02:33:16.506855480 +0000
-+++ kdebase/knetattach/knetattach.desktop	2005-03-17 02:33:22.186991968 +0000
-@@ -45,3 +45,4 @@
- X-KDE-StartupNotify=true
- Categories=Qt;KDE;Network;
- DocPath=knetattach/index.html
-+OnlyShowIn=Old;
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
deleted file mode 100644
index d5e944949..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:22.645846992 +0000
-+++ kdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:30.907591016 +0000
-@@ -67,3 +67,4 @@
- X-KDE-StartupNotify=true
- OnlyShowIn=KDE;
- Categories=Qt;KDE;Settings;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
deleted file mode 100644
index 0bba8642d..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kpersonalizer/kpersonalizer.desktop-orig	2005-03-17 01:05:16.091600616 +0000
-+++ kdebase/kpersonalizer/kpersonalizer.desktop	2005-03-17 01:05:23.678447240 +0000
-@@ -77,3 +77,4 @@
- X-DCOP-ServiceType=Multi
- Categories=Qt;KDE;Settings;
- OnlyShowIn=KDE;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
deleted file mode 100644
index 317ad4913..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kmenuedit/kmenuedit.desktop-orig	2005-03-17 01:06:56.707304704 +0000
-+++ kdebase/kmenuedit/kmenuedit.desktop	2005-03-17 01:07:22.785340240 +0000
-@@ -82,3 +82,4 @@
- 
- X-DCOP-ServiceType=Unique
- Categories=Qt;KDE;Settings;
-+OnlyShowIn=Old;
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
deleted file mode 100644
index 6b6d4e047..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:26.659629872 +0000
-+++ kdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:34.189485160 +0000
-@@ -64,3 +64,4 @@
- Name[zh_CN]=菜单更新工具
- X-DCOP-ServiceType=Multi
- Categories=Qt;KDE;Settings;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
deleted file mode 100644
index 7c2e1bd8c..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/konsole/konsolesu.desktop	2005-03-17 01:34:39.399537064 +0000
-+++ kdebase/konsole/konsolesu.desktop	2005-03-17 01:34:44.692732376 +0000
-@@ -64,3 +64,4 @@
- Name[zh_CN]=终端程序 - 超级用户模式
- X-KDE-AuthorizeAction=shell_access
- Categories=Qt;KDE;System;TerminalEmulator;X-KDE-More;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
deleted file mode 100644
index c3dec77fa..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/konqueror/konquerorsu.desktop	2006-10-03 11:48:15.000000000 +0000
-+++ kdebase/konqueror/konquerorsu.desktop	2006-10-03 11:49:51.000000000 +0000
-@@ -82,3 +82,4 @@
- 
- Categories=Qt;KDE;System;X-KDE-More;
- NotShowIn=GNOME;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
deleted file mode 100644
index 8603d5661..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop	2005-03-17 02:18:04.198547424 +0000
-+++ kdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop	2005-03-17 02:18:12.320312728 +0000
-@@ -71,3 +71,4 @@
- Terminal=false
- InitialPreference=1
- Categories=Qt;KDE;Utility;X-KDE-More;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
deleted file mode 100644
index e2c86bfa8..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kpager/kpager.desktop	2005-11-08 22:36:23.000000000 +0000
-+++ kdebase/kpager/kpager.desktop	2005-11-11 00:25:22.000000000 +0000
-@@ -96,3 +96,4 @@
- X-KDE-StartupNotify=false
- X-DCOP-ServiceType=Unique
- Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
deleted file mode 100644
index ce2f3e8dc..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/klipper/klipper.desktop	2006-10-03 11:53:50.000000000 +0000
-+++ kdebase/klipper/klipper.desktop	2006-10-03 11:58:00.000000000 +0000
-@@ -143,3 +143,4 @@
- Comment[zh_CN]=剪贴历史工具
- Comment[zh_TW]=剪貼紀錄公用程式
- 
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
deleted file mode 100644
index f2d3f90f9..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop	2005-11-08 22:36:23.000000000 +0000
-+++ kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop	2005-12-15 16:22:28.000000000 +0000
-@@ -90,3 +90,4 @@
- Terminal=false
- X-DCOP-ServiceType=Multi
- Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_48_hide_display.diff
deleted file mode 100644
index b813874f4..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_48_hide_display.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kcontrol/display/display.desktop	2006-01-19 17:00:54.000000000 +0000
-+++ kdebase/kcontrol/display/display.desktop	2006-02-15 15:25:51.000000000 +0000
-@@ -135,3 +135,4 @@
- Comment[zh_CN]=显示设置
- Comment[zh_TW]=顯示設定
- Categories=Qt;KDE;X-KDE-settings-hardware;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
deleted file mode 100644
index 88081e51e..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur kdebase-3.5.4/kdeprint/printmgr/printers.desktop kdebase-3.5.4.new/kdeprint/printmgr/printers.desktop
---- kdebase-3.5.4/kdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
-+++ kdebase-3.5.4.new/kdeprint/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
- 
--Categories=Qt;KDE;X-KDE-settings-hardware;Settings;
-+Categories=Qt;KDE;X-KDE-settings-hardware;
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
deleted file mode 100644
index 8fc8abb28..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nur kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
---- kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
-+++ kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
-@@ -214,3 +214,4 @@
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
- 
- Categories=Qt;KDE;X-KDE-settings-components;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
deleted file mode 100644
index 2c106549e..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- tdm/kfrontend/tdmshutdown.cpp
-+++ tdm/kfrontend/tdmshutdown.cpp
-@@ -467,7 +467,7 @@
- 	, targetList( 0 )
- {
- 
--	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
- 
- 	TQVBoxLayout* vbox = new TQVBoxLayout( this );
- 	TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh );
-
---- ksmserver/shutdowndlg.cpp
-+++ ksmserver/shutdowndlg.cpp
-@@ -278,7 +278,7 @@
-                             2 * KDialog::spacingHint() );
- 
- 	// default factor
--	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);	
-+	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);	
- 
- 	// slighty more space for the new logout    
- 	int factor = 2;
\ No newline at end of file
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff
deleted file mode 100644
index c0f83b591..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase-3.5.7/kfind/Kfind.desktop~	2007-05-14 08:55:33.000000000 +0100
-+++ kdebase-3.5.7/kfind/Kfind.desktop	2007-08-31 15:22:09.000000000 +0100
-@@ -73,3 +73,4 @@
- X-KDE-StartupNotify=true
- OnlyShowIn=KDE;
- Categories=Qt;KDE;Core;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
deleted file mode 100644
index f2584303c..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- kdebase-3.5.8/tdm/backend/dm.c	2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-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;
- 				}
---- kdebase-3.5.8/tdm/backend/server.c	2008-02-13 23:59:17.000000000 +0200
-+++ kdebase-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;