summaryrefslogtreecommitdiffstats
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-09 04:46:47 +0200
commita4f8b23ad79f99f0c706ff0310cb949e0ad46c2b (patch)
treeafdd8682a261206b8e02efc64f88c75dc3af21d0
parentcae9ecbd0261f2868d1983dda91ffcac7acb9f23 (diff)
downloadtde-packaging-a4f8b23ad79f99f0c706ff0310cb949e0ad46c2b.tar.gz
tde-packaging-a4f8b23ad79f99f0c706ff0310cb949e0ad46c2b.zip
Fix tdebase FTBFS on Ubuntu
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff3
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff4
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff4
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