From 2d59086b104acd7b4711fd067c9bb4480158e6ab Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 17 Apr 2014 13:57:20 +0900 Subject: Removed Ubuntu/precise folder --- .../debian/patches/disable_default_tdm_theme.diff | 15 ----- .../debian/patches/disable_starttde_wallpaper.diff | 31 ----------- .../patches/kubuntu_04_hide_menu_entries.diff | 7 --- .../patches/kubuntu_06_hide_home_menu_entry.diff | 7 --- .../kubuntu_07_hide_knetattach_menu_entry.diff | 7 --- .../kubuntu_08_hide_kcmkicker_menu_entry.diff | 9 --- .../kubuntu_09_hide_kpersonaliser_menu_entry.diff | 7 --- .../kubuntu_10_hide_kmenuedit_menu_entry.diff | 7 --- .../kubuntu_11_hide_kappfinder_menu_entry.diff | 7 --- .../kubuntu_13_hide_konsolesu_menu_entry.diff | 9 --- .../kubuntu_14_hide_konquerorsu_menu_entry.diff | 9 --- .../kubuntu_15_hide_tdefontview_menu_entry.diff | 9 --- .../patches/kubuntu_16_hide_kpager_menu_entry.diff | 7 --- .../kubuntu_35_hide_klipper_menu_entry.diff | 7 --- .../kubuntu_37_hide_tdeprintfax_menu_entry.diff | 7 --- .../debian/patches/kubuntu_48_hide_display.diff | 7 --- .../patches/kubuntu_70_hide_printers_desktop.diff | 9 --- ...kubuntu_78_kcontrol_hide_component_chooser.diff | 11 ---- .../debian/patches/kubuntu_89_new_logout_ui.diff | 22 -------- .../debian/patches/kubuntu_9904_hide_kfind.diff | 7 --- .../patches/kubuntu_9921_tdm_bulletproof_x.diff | 64 ---------------------- ubuntu/precise/tdebase/debian/patches/series | 21 ------- 22 files changed, 286 deletions(-) delete mode 100644 ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_48_hide_display.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff delete mode 100644 ubuntu/precise/tdebase/debian/patches/series (limited to 'ubuntu/precise/tdebase/debian/patches') diff --git a/ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/precise/tdebase/debian/patches/disable_default_tdm_theme.diff deleted file mode 100644 index 45798364e..000000000 --- a/ubuntu/precise/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/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/precise/tdebase/debian/patches/disable_starttde_wallpaper.diff deleted file mode 100644 index 3949f4040..000000000 --- a/ubuntu/precise/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 /usr/share/wallpapers/isadora.png.desktop ]; then --cat >"$tdehome/share/config/kdesktoprc" <"$tdehome/share/config/kdesktoprc" <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/precise/tdebase/debian/patches/series b/ubuntu/precise/tdebase/debian/patches/series deleted file mode 100644 index 382f72a04..000000000 --- a/ubuntu/precise/tdebase/debian/patches/series +++ /dev/null @@ -1,21 +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_78_kcontrol_hide_component_chooser.diff -kubuntu_89_new_logout_ui.diff -kubuntu_9904_hide_kfind.diff -kubuntu_9921_tdm_bulletproof_x.diff -- cgit v1.2.3