From 5f064b8a93e143df9c4b6cc47b783f935be78acc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 3 Jul 2012 22:21:46 -0500 Subject: Fix tdebase FTBFS on Ubuntu --- .../tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 6bebc2437..a46ab143c 100644 --- 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 @@ -3,5 +3,5 @@ @@ -90,3 +90,4 @@ Terminal=false X-DCOP-ServiceType=Multi - Categories=Qt;TDE;Utility + Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals; +NoDisplay=true -- cgit v1.2.3 From a0316d513a72c5838c32f09208a60e1efd0c990c 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: Update base path in patches for tdebase on Debian and Ubuntu --- debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff | 4 ++-- debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff | 4 ++-- debian/squeeze/tdebase/debian/patches/disable_default_tdm_theme.diff | 4 ++-- debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff | 4 ++-- ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff | 4 ++-- .../maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff | 4 ++-- ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff b/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff index 200843f01..e50536e78 100644 --- a/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- tdm/config.def -+++ tdm/config.def +--- a/tdm/config.def ++++ b/tdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff index a45290729..3949f4040 100644 --- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,5 +1,5 @@ ---- starttde -+++ starttde +--- a/starttde ++++ b/starttde @@ -288,17 +288,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/debian/squeeze/tdebase/debian/patches/disable_default_tdm_theme.diff b/debian/squeeze/tdebase/debian/patches/disable_default_tdm_theme.diff index 200843f01..e50536e78 100644 --- a/debian/squeeze/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/debian/squeeze/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- tdm/config.def -+++ tdm/config.def +--- a/tdm/config.def ++++ b/tdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff index a45290729..3949f4040 100644 --- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,5 +1,5 @@ ---- starttde -+++ starttde +--- a/starttde ++++ b/starttde @@ -288,17 +288,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff index 20cb49429..85055e149 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- tdm/config.def -+++ tdm/config.def +--- a/tdm/config.def ++++ b/tdm/config.def @@ -2614,8 +2614,8 @@ Key: UseTheme diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index a45290729..3949f4040 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,5 +1,5 @@ ---- starttde -+++ starttde +--- a/starttde ++++ b/starttde @@ -288,17 +288,17 @@ . "$tdehome/share/config/startupconfig" fi 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 index 63c0c8add..1eddf9e40 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- tdm/kfrontend/tdmshutdown.cpp -+++ tdm/kfrontend/tdmshutdown.cpp +--- a/tdm/kfrontend/tdmshutdown.cpp ++++ b/tdm/kfrontend/tdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { -- cgit v1.2.3 From 1e9f0fd00605b4fc601498cbec0d523c96aea2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 8 Jul 2012 20:55:43 +0200 Subject: Fix update base path in patches for tdebase on Ubuntu --- ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 1eddf9e40..c56f4f7cd 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -10,8 +10,8 @@ TQVBoxLayout* vbox = new TQVBoxLayout( this ); TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); ---- ksmserver/shutdowndlg.cpp -+++ ksmserver/shutdowndlg.cpp +--- a/ksmserver/shutdowndlg.cpp ++++ b/ksmserver/shutdowndlg.cpp @@ -668,7 +668,7 @@ 2 * KDialog::spacingHint() ); -- cgit v1.2.3 From cae9ecbd0261f2868d1983dda91ffcac7acb9f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 9 Jul 2012 02:58:42 +0200 Subject: Fix tdebase FTBFS on Ubuntu --- .../tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 index c56f4f7cd..8fb71d7da 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,18 +1,17 @@ --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp -@@ -467,7 +467,7 @@ - , targetList( 0 ) +@@ -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); - TQVBoxLayout* vbox = new TQVBoxLayout( this ); - TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); - + TQFrame* lfrm = new TQFrame( this ); + TQHBoxLayout* hbuttonbox; --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp -@@ -668,7 +668,7 @@ +@@ -697,7 +697,7 @@ 2 * KDialog::spacingHint() ); // default factor -- cgit v1.2.3 From a4f8b23ad79f99f0c706ff0310cb949e0ad46c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 9 Jul 2012 04:46:47 +0200 Subject: Fix tdebase FTBFS on Ubuntu --- ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff | 3 ++- .../tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff | 4 ++-- .../tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff | 4 ++-- 3 files changed, 6 insertions(+), 5 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 index 85055e149..45798364e 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,6 +1,6 @@ --- a/tdm/config.def +++ b/tdm/config.def -@@ -2614,8 +2614,8 @@ +@@ -2644,9 +2644,9 @@ Key: UseTheme Type: bool @@ -12,3 +12,4 @@ Comment: & Description: Whether the greeter should be themed. + 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 index 1c4def20e..ad3284bbb 100644 --- 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 @@ -1,7 +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 -@@ -64,3 +64,4 @@ - Name[zh_CN]=菜单更新工具 +@@ -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 index 8a7d90420..cd5b0b2eb 100644 --- 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 @@ -1,7 +1,7 @@ --- tdebase/konsole/konsolesu.desktop +++ tdebase/konsole/konsolesu.desktop -@@ -64,3 +64,4 @@ - Name[zh_CN]=终端程序 - 超级用户模式 +@@ -81,3 +81,4 @@ + Name[zh_TW]=終端機程式 - 超級使用者模式 X-TDE-AuthorizeAction=shell_access Categories=Qt;TDE;X-TDE-System-su; +NoDisplay=true -- cgit v1.2.3 From 1ec238be7cfeda3d652bde0414fb551e8aca5ad0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 8 Jul 2012 22:47:52 -0500 Subject: Add missing files to tdebase on Debian and Ubuntu --- debian/lenny/tdebase/debian/tdebase-trinity-bin.install | 2 ++ debian/squeeze/tdebase/debian/tdebase-trinity-bin.install | 2 ++ ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install | 2 ++ 3 files changed, 6 insertions(+) diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install index bc3a2f1c6..64dfbd22a 100644 --- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install +++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install @@ -1,3 +1,5 @@ +debian/tmp/opt/trinity/bin/migratekde3 +debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install index bc3a2f1c6..64dfbd22a 100644 --- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install +++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install @@ -1,3 +1,5 @@ +debian/tmp/opt/trinity/bin/migratekde3 +debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index bc3a2f1c6..64dfbd22a 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -1,3 +1,5 @@ +debian/tmp/opt/trinity/bin/migratekde3 +debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak -- cgit v1.2.3