diff options
Diffstat (limited to 'ubuntu/maverick/tdebase')
7 files changed, 22 insertions, 20 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 20cb49429..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 @@ ---- tdm/config.def -+++ tdm/config.def -@@ -2614,8 +2614,8 @@ +--- a/tdm/config.def ++++ b/tdm/config.def +@@ -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/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_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 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 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..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 @@ ---- tdm/kfrontend/tdmshutdown.cpp -+++ tdm/kfrontend/tdmshutdown.cpp -@@ -467,7 +467,7 @@ - , targetList( 0 ) +--- 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); - TQVBoxLayout* vbox = new TQVBoxLayout( this ); - TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); - ---- ksmserver/shutdowndlg.cpp -+++ ksmserver/shutdowndlg.cpp -@@ -668,7 +668,7 @@ + TQFrame* lfrm = new TQFrame( this ); + TQHBoxLayout* hbuttonbox; +--- a/ksmserver/shutdowndlg.cpp ++++ b/ksmserver/shutdowndlg.cpp +@@ -697,7 +697,7 @@ 2 * KDialog::spacingHint() ); // default factor 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 |