Split precise from maverick

21 files changed, 254 insertions, 0 deletions

diff --git a/ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff
new file mode 100644
index 000000000..45798364e
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff
@@ -0,0 +1,15 @@
+--- 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/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff
new file mode 100644
index 000000000..3949f4040
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -0,0 +1,31 @@
+--- 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 /usr/share/wallpapers/isadora.png.desktop ]; then
+-cat >"$tdehome/share/config/kdesktoprc" <<EOF
+-[Desktop0]
+-Wallpaper=isadora.png
+-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 /usr/share/wallpapers/isadora.png.desktop ]; then
++#cat >"$tdehome/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/precise/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
new file mode 100644
index 000000000..b6fb834e0
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -0,0 +1,7 @@
+--- 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
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;TDE;TextEditor;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
new file mode 100644
index 000000000..aa97a6a24
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
new file mode 100644
index 000000000..405e2c052
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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 @@
+ X-TDE-StartupNotify=true
+ Categories=Qt;TDE;Network;
+ DocPath=knetattach/index.html
++OnlyShowIn=Old;
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
new file mode 100644
index 000000000..0d125c335
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:22.645846992 +0000
++++ tdebase/kicker/kicker/kcmkicker.desktop	2005-03-17 01:03:30.907591016 +0000
+@@ -67,3 +67,4 @@
+ X-TDE-StartupNotify=true
+ OnlyShowIn=TDE;
+ Categories=Qt;TDE;Settings;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
new file mode 100644
index 000000000..0bbb613a9
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
new file mode 100644
index 000000000..878800634
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
new file mode 100644
index 000000000..ad3284bbb
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
new file mode 100644
index 000000000..cd5b0b2eb
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/konsole/konsolesu.desktop
++++ tdebase/konsole/konsolesu.desktop
+@@ -81,3 +81,4 @@
+ Name[zh_TW]=終端機程式 - 超級使用者模式
+ X-TDE-AuthorizeAction=shell_access
+ Categories=Qt;TDE;X-TDE-System-su;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
new file mode 100644
index 000000000..bd56fd131
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/konqueror/konquerorsu.desktop
++++ tdebase/konqueror/konquerorsu.desktop
+@@ -82,3 +82,4 @@
+ 
+ Categories=Qt;TDE;X-TDE-System-su;
+ NotShowIn=GNOME;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
new file mode 100644
index 000000000..59345d518
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
++++ tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
+@@ -71,3 +71,4 @@
+ Terminal=false
+ InitialPreference=1
+ Categories=Qt;TDE;Graphics;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
new file mode 100644
index 000000000..3eab104cb
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
new file mode 100644
index 000000000..bfd5fd2af
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/klipper/klipper.desktop
++++ tdebase/klipper/klipper.desktop
+@@ -143,3 +143,4 @@
+ Comment[zh_CN]=剪贴历史工具
+ Comment[zh_TW]=剪貼紀錄公用程式
+ 
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
new file mode 100644
index 000000000..a46ab143c
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_48_hide_display.diff
new file mode 100644
index 000000000..dddb101e6
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_48_hide_display.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
new file mode 100644
index 000000000..8efaadcab
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -0,0 +1,9 @@
+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
+ 
+-Categories=Qt;TDE;X-TDE-settings-hardware;Settings;
++Categories=Qt;TDE;X-TDE-settings-hardware;
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
new file mode 100644
index 000000000..3f618ffef
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
@@ -0,0 +1,8 @@
+diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
+--- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
++++ tdebase-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;TDE;X-TDE-settings-components;
++NoDisplay=true
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
new file mode 100644
index 000000000..8fb71d7da
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -0,0 +1,22 @@
+--- a/tdm/kfrontend/tdmshutdown.cpp
++++ b/tdm/kfrontend/tdmshutdown.cpp
+@@ -472,7 +472,7 @@
+ {
+ 	setCaption(i18n("Shutdown TDE"));
+ 
+-	bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
++	bool doUbuntuLogout = KConfigGroup(KGlobal::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 = 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;
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
new file mode 100644
index 000000000..8db1221a5
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
@@ -0,0 +1,7 @@
+--- 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/precise/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
new file mode 100644
index 000000000..c312b6fb7
--- /dev/null
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
@@ -0,0 +1,64 @@
+--- 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;