summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-09 04:46:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:18:05 +0200
commitd23bd91d8248f997df3c074e5459157e210d24a8 (patch)
treeb1b5cea62b7f8236b7c2ae9223e92a5dad548df7 /ubuntu/maverick
parenta90de98f32fceeb1c5acee474ce0b8d5b735c062 (diff)
downloadtde-packaging-d23bd91d8248f997df3c074e5459157e210d24a8.tar.gz
tde-packaging-d23bd91d8248f997df3c074e5459157e210d24a8.zip
Fix tdebase FTBFS on Ubuntu
(cherry picked from commit a4f8b23ad79f99f0c706ff0310cb949e0ad46c2b)
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff3
-rw-r--r--ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff4
-rw-r--r--ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff4
3 files changed, 6 insertions, 5 deletions
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 847a5849f..a6859c81f 100644
--- a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff
+++ b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/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/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
index 6b6d4e047..08a6c5675 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ b/ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
@@ -1,7 +1,7 @@
--- kdebase/kappfinder/kappfinder.desktop 2005-03-17 01:08:26.659629872 +0000
+++ kdebase/kappfinder/kappfinder.desktop 2005-03-17 01:08:34.189485160 +0000
-@@ -64,3 +64,4 @@
- Name[zh_CN]=菜单更新工具
+@@ -79,3 +79,4 @@
+ Name[zh_TW]=選單更新工具
X-DCOP-ServiceType=Multi
Categories=Qt;KDE;Settings;
+NoDisplay=true
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index 723aec0d2..f9c8e628c 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -1,7 +1,7 @@
--- kdebase/konsole/konsolesu.desktop
+++ kdebase/konsole/konsolesu.desktop
-@@ -64,3 +64,4 @@
- Name[zh_CN]=终端程序 - 超级用户模式
+@@ -81,3 +81,4 @@
+ Name[zh_TW]=終端機程式 - 超級使用者模式
X-KDE-AuthorizeAction=shell_access
Categories=Qt;KDE;X-KDE-System-su;
+NoDisplay=true