From 92dd6e6ee04c07e7e6da8807ed6e4d43e35fa62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 8 Jul 2012 20:11:37 +0200 Subject: [PATCH] Update base path in patches for tdebase on Debian and Ubuntu (cherry picked from commit a0316d513a72c5838c32f09208a60e1efd0c990c) --- .../kdebase/debian/patches/disable_default_kdm_theme.diff | 4 ++-- .../kdebase/debian/patches/disable_startkde_wallpaper.diff | 4 ++-- .../kdebase/debian/patches/disable_default_kdm_theme.diff | 4 ++-- .../kdebase/debian/patches/disable_startkde_wallpaper.diff | 4 ++-- .../kdebase/debian/patches/disable_default_kdm_theme.diff | 4 ++-- .../kdebase/debian/patches/disable_startkde_wallpaper.diff | 4 ++-- .../kdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/lenny/kdebase/debian/patches/disable_default_kdm_theme.diff b/debian/lenny/kdebase/debian/patches/disable_default_kdm_theme.diff index ad6fa4cf8..918a6ac17 100644 --- a/debian/lenny/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/debian/lenny/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- a/kdm/config.def ++++ b/kdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme diff --git a/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff index c88d50b0b..f78ecf14e 100644 --- a/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff +++ b/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff @@ -1,5 +1,5 @@ ---- startkde -+++ startkde +--- a/startkde ++++ b/startkde @@ -288,17 +288,17 @@ . "$kdehome/share/config/startupconfig" fi diff --git a/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff b/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff index ad6fa4cf8..918a6ac17 100644 --- a/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- a/kdm/config.def ++++ b/kdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme diff --git a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff index c88d50b0b..f78ecf14e 100644 --- a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff +++ b/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff @@ -1,5 +1,5 @@ ---- startkde -+++ startkde +--- a/startkde ++++ b/startkde @@ -288,17 +288,17 @@ . "$kdehome/share/config/startupconfig" fi diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff index 9f439d657..847a5849f 100644 --- a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- a/kdm/config.def ++++ b/kdm/config.def @@ -2614,8 +2614,8 @@ Key: UseTheme diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff index c88d50b0b..f78ecf14e 100644 --- a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff +++ b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff @@ -1,5 +1,5 @@ ---- startkde -+++ startkde +--- a/startkde ++++ b/startkde @@ -288,17 +288,17 @@ . "$kdehome/share/config/startupconfig" fi diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 52fa6a4d5..edc6c90ea 100644 --- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp +--- a/kdm/kfrontend/kdmshutdown.cpp ++++ b/kdm/kfrontend/kdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { @@ -20,4 +20,4 @@ + 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 + int factor = 2;