summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-02-01 10:27:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-02-01 10:27:48 +0100
commitcb8f9519d87272d7eb32636836e37087761ec288 (patch)
treeea96e4b3f2bf945aff0607cb10391bae1079a209
parentb8ab25fa7bc8765aa0bfbb73edad2464eaa905ec (diff)
parent72f974214d634708b1449a80565ab6ed08ccd6d3 (diff)
downloadtde-packaging-cb8f9519d87272d7eb32636836e37087761ec288.tar.gz
tde-packaging-cb8f9519d87272d7eb32636836e37087761ec288.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff15
-rw-r--r--ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff15
-rw-r--r--ubuntu/raring/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff15
3 files changed, 27 insertions, 18 deletions
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 3f618ffef..ae8e9141a 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,8 +1,11 @@
-diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop 2006-07-22 10:15:23.000000000 +0200
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop 2006-09-08 13:42:48.000000000 +0200
-@@ -214,3 +214,4 @@
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
-
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
+--- 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
Categories=Qt;TDE;X-TDE-settings-components;
+NoDisplay=true
+
+ Name=Default Applications
+ Name[af]=Verstektoepassings
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index 3f618ffef..ae8e9141a 100644
--- a/ubuntu/precise/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/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
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop 2006-07-22 10:15:23.000000000 +0200
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop 2006-09-08 13:42:48.000000000 +0200
-@@ -214,3 +214,4 @@
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
-
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
+--- 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
Categories=Qt;TDE;X-TDE-settings-components;
+NoDisplay=true
+
+ Name=Default Applications
+ Name[af]=Verstektoepassings
diff --git a/ubuntu/raring/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/raring/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index 3f618ffef..ae8e9141a 100644
--- a/ubuntu/raring/tdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/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
---- tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop 2006-07-22 10:15:23.000000000 +0200
-+++ tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop 2006-09-08 13:42:48.000000000 +0200
-@@ -214,3 +214,4 @@
- Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle
-
+diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
+--- 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
Categories=Qt;TDE;X-TDE-settings-components;
+NoDisplay=true
+
+ Name=Default Applications
+ Name[af]=Verstektoepassings