Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff

@@ -1,8 +1,11 @@
-diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
+--- a/kcontrol/componentchooser/componentchooser.desktop
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
++++ b/kcontrol/componentchooser/componentchooser.desktop
-@@ -214,3 +214,4 @@
+@@ -6,6 +6,7 @@ X-TDE-Library=componentchooser
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
+ X-TDE-ParentApp=kcontrol
- 
+ DocPath=kcontrol/componentchooser/index.html
  Categories=Qt;TDE;X-TDE-settings-components;
 +NoDisplay=true
+ 
+ Name=Default Applications
+ Name[af]=Verstektoepassings

ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff

@@ -1,8 +1,11 @@
-diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
+--- a/kcontrol/componentchooser/componentchooser.desktop
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
++++ b/kcontrol/componentchooser/componentchooser.desktop
-@@ -214,3 +214,4 @@
+@@ -6,6 +6,7 @@ X-TDE-Library=componentchooser
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
+ X-TDE-ParentApp=kcontrol
- 
+ DocPath=kcontrol/componentchooser/index.html
  Categories=Qt;TDE;X-TDE-settings-components;
 +NoDisplay=true
+ 
+ Name=Default Applications
+ Name[af]=Verstektoepassings

ubuntu/raring/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff

@@ -1,8 +1,11 @@
-diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop	2006-07-22 10:15:23.000000000 +0200
+--- a/kcontrol/componentchooser/componentchooser.desktop
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop	2006-09-08 13:42:48.000000000 +0200
++++ b/kcontrol/componentchooser/componentchooser.desktop
-@@ -214,3 +214,4 @@
+@@ -6,6 +6,7 @@ X-TDE-Library=componentchooser
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
+ X-TDE-ParentApp=kcontrol
- 
+ DocPath=kcontrol/componentchooser/index.html
  Categories=Qt;TDE;X-TDE-settings-components;
 +NoDisplay=true
+ 
+ Name=Default Applications
+ Name[af]=Verstektoepassings