Refresh patches in tdebase on Ubuntu

6 files changed, 30 insertions, 24 deletions

diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index b6fb834e0..79aebbd1d 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -1,7 +1,9 @@
---- tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:43.361137168 +0000
-+++ tdebase/kate/data/kwrite.desktop	2005-03-17 02:30:51.972827992 +0000
-@@ -103,3 +103,4 @@
- InitialPreference=8
+diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
+index dd64b58..0af3e44 100644
+--- a/kate/data/kwrite.desktop
++++ b/kate/data/kwrite.desktop
+@@ -109,3 +109,4 @@ Terminal=false
+ X-TDE-InitialPreference=8
  X-DCOP-ServiceType=Multi
  Categories=Qt;TDE;TextEditor;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 405e2c052..608802a75 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:16.506855480 +0000
-+++ tdebase/knetattach/knetattach.desktop	2005-03-17 02:33:22.186991968 +0000
-@@ -45,3 +45,4 @@
+diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
+index 6003b68..f33e1f4 100644
+--- a/knetattach/knetattach.desktop
++++ b/knetattach/knetattach.desktop
+@@ -80,3 +80,4 @@ Terminal=false
  X-TDE-StartupNotify=true
  Categories=Qt;TDE;Network;
- DocPath=knetattach/index.html
+ X-DocPath=knetattach/index.html
 +OnlyShowIn=Old;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index 1ecc9f46f..c934da2d5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
@@ -1,9 +1,9 @@
-Index: b/kicker/kicker/kcmkicker.desktop
-===================================================================
+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 @@
- DocPath=kicker/configuring.html
+@@ -79,3 +79,4 @@ X-TDE-StartupNotify=true
+ X-DocPath=kicker/configuring.html
  OnlyShowIn=TDE;
  Categories=Qt;TDE;Settings;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index e6228a283..009d6f9db 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -1,9 +1,9 @@
-Index: b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-===================================================================
+diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+index 5d5e2b8..c989adf 100644
 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
 +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
-@@ -99,3 +99,4 @@
- InitialPreference=1
+@@ -99,3 +99,4 @@ Terminal=false
+ X-TDE-InitialPreference=1
  Categories=Qt;TDE;Graphics;
- DocPath=tdefontview/index.html
+ X-DocPath=tdefontview/index.html
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index 8efaadcab..607457c94 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -1,9 +1,10 @@
-diff -Nur tdebase-3.5.4/tdeprint/printmgr/printers.desktop tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop
---- tdebase-3.5.4/tdeprint/printmgr/printers.desktop	2006-07-22 10:15:47.000000000 +0200
-+++ tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop	2006-08-21 22:20:40.000000000 +0200
-@@ -219,4 +219,4 @@
- Keywords[zh_TW]=print,printer,printing management,列印,印表機,列印管理
- Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
+diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.desktop
+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
  
 -Categories=Qt;TDE;X-TDE-settings-hardware;Settings;
 +Categories=Qt;TDE;X-TDE-settings-hardware;
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index ae8e9141a..0e0627870 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
@@ -1,9 +1,10 @@
 diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
+index fdd1d41..e6913a7 100644
 --- a/kcontrol/componentchooser/componentchooser.desktop
 +++ b/kcontrol/componentchooser/componentchooser.desktop
 @@ -6,6 +6,7 @@ X-TDE-Library=componentchooser
  X-TDE-ParentApp=kcontrol
- DocPath=kcontrol/componentchooser/index.html
+ X-DocPath=kcontrol/componentchooser/index.html
  Categories=Qt;TDE;X-TDE-settings-components;
 +NoDisplay=true