DEB tdebase: Refresh Ubuntu specific patches.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

8 files changed, 41 insertions, 31 deletions

diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
index aa97a6a24..99cae843a 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
@@ -1,7 +1,7 @@
---- tdebase/konqueror/Home.desktop-orig	2005-03-17 02:27:51.835213072 +0000
-+++ tdebase/konqueror/Home.desktop	2005-03-17 02:27:58.766159408 +0000
-@@ -151,3 +151,4 @@
- GenericName[zu]=Amafayela Omuntu siqu
+--- tdebase/konqueror/Home.desktop
++++ tdebase/konqueror/Home.desktop
+@@ -10,3 +10,4 @@
+ 
  Categories=Qt;TDE;Core;
  OnlyShowIn=TDE;
 +NoDisplay=true
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index c934da2d5..de78884ef 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -2,8 +2,11 @@ diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop
 index c7d4939..fd8b513 100644
 --- a/kicker/kicker/kcmkicker.desktop
 +++ b/kicker/kicker/kcmkicker.desktop
-@@ -79,3 +79,4 @@ X-TDE-StartupNotify=true
+@@ -5,6 +5,7 @@
+ X-TDE-StartupNotify=true
  X-DocPath=kicker/configuring.html
  OnlyShowIn=TDE;
- Categories=Qt;TDE;Settings;
 +NoDisplay=true
+ Categories=Qt;TDE;Settings;
+ 
+ Name=Configure the Panel
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
index 878800634..86a7ef17a 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/kmenuedit/kmenuedit.desktop-orig	2005-03-17 01:06:56.707304704 +0000
-+++ tdebase/kmenuedit/kmenuedit.desktop	2005-03-17 01:07:22.785340240 +0000
-@@ -82,3 +82,4 @@
- 
+--- tdebase/kmenuedit/kmenuedit.desktop
++++ tdebase/kmenuedit/kmenuedit.desktop
+@@ -9,5 +9,6 @@
+ Type=Application
+ X-TDE-StartupNotify=true
+ OnlyShowIn=TDE;
++NoDisplay=true
  X-DCOP-ServiceType=Unique
  Categories=Qt;TDE;Settings;
-+OnlyShowIn=Old;
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
index ad3284bbb..904ec61ec 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
@@ -1,7 +1,8 @@
---- tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:26.659629872 +0000
-+++ tdebase/kappfinder/kappfinder.desktop	2005-03-17 01:08:34.189485160 +0000
-@@ -80,3 +80,4 @@
- GenericName[zh_TW]=選單更新工具
- X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;Settings;
+--- tdebase/kappfinder/kappfinder.desktop
++++ tdebase/kappfinder/kappfinder.desktop
+@@ -8,4 +8,5 @@
+ Icon=kappfinder
+ Terminal=false
+ OnlyShowIn=TDE;
 +NoDisplay=true
+ Categories=Qt;TDE;Settings;
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index 9dfccdbd7..729b15585 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -2,8 +2,11 @@ Index: b/konsole/konsolesu.desktop
 ===================================================================
 --- a/konsole/konsolesu.desktop
 +++ b/konsole/konsolesu.desktop
-@@ -82,3 +82,4 @@
- GenericName[zh_TW]=終端機程式 - 超級使用者模式
- X-TDE-AuthorizeAction=shell_access
- Categories=Qt;TDE;X-TDE-System-su;
+@@ -6,6 +6,7 @@
+ MimeType=application/x-konsole;
+ Terminal=false
+ OnlyShowIn=TDE;
 +NoDisplay=true
+ 
+ Name=Konsole
+ 
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
index bfd5fd2af..b381684ca 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
@@ -1,7 +1,8 @@
 --- tdebase/klipper/klipper.desktop
 +++ tdebase/klipper/klipper.desktop
-@@ -143,3 +143,4 @@
- Comment[zh_CN]=剪贴历史工具
- Comment[zh_TW]=剪貼紀錄公用程式
- 
+@@ -17,4 +17,5 @@
+ X-TDE-UniqueApplet=true
+ X-TDE-autostart-condition=klipperrc:General:AutoStart:true
+ OnlyShowIn=TDE;
 +NoDisplay=true
+ Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff
index 7fde79a63..9f645ed67 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff
@@ -1,7 +1,7 @@
 --- tdebase/kcontrol/display/display.desktop
 +++ tdebase/kcontrol/display/display.desktop
-@@ -155,3 +155,4 @@
- Comment[zh_TW]=顯示設定
-
+@@ -13,3 +13,4 @@
+ Comment=Display Settings
+ 
  Categories=Qt;TDE;X-TDE-settings-hardware;
 +NoDisplay=true
diff --git a/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index d2ff6732f..ddf509835 100644
--- a/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -2,9 +2,9 @@ diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.des
 index f4a363d..f990394 100644
 --- a/tdeprint/printmgr/printers.desktop
 +++ b/tdeprint/printmgr/printers.desktop
-@@ -233,4 +233,4 @@ Keywords[zh_CN]=print;printer;printing management;打印;打印机;打印管理
- Keywords[zh_TW]=print;printer;printing management;列印;印表機;列印管理;
- Keywords[zu]=shicilela;umshicileli;abaphathi boshicilelo;
+@@ -15,4 +15,4 @@
+ 
+ Keywords=print;printer;printing management;
  
 -Categories=Qt;TDE;X-TDE-settings-hardware;Settings;
 +Categories=Qt;TDE;X-TDE-settings-hardware;