From 12c4bdcc94abe48cf7cac96c389a3e2bdfdd4aa1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 29 Jan 2014 20:34:45 -0600 Subject: Fix tdebase FTBFS on Ubuntu --- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 10 +++++----- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 10 +++++----- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 10 +++++----- 3 files changed, 15 insertions(+), 15 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..547510760 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,8 @@ 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 - +--- tdebase/kcontrol/componentchooser/componentchooser.desktop ++++ tdebase/kcontrol/componentchooser/componentchooser.desktop +@@ -6,3 +6,4 @@ + X-TDE-ParentApp=kcontrol + DocPath=kcontrol/componentchooser/index.html Categories=Qt;TDE;X-TDE-settings-components; +NoDisplay=true 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..547510760 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,8 @@ 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 - +--- tdebase/kcontrol/componentchooser/componentchooser.desktop ++++ tdebase/kcontrol/componentchooser/componentchooser.desktop +@@ -6,3 +6,4 @@ + X-TDE-ParentApp=kcontrol + DocPath=kcontrol/componentchooser/index.html Categories=Qt;TDE;X-TDE-settings-components; +NoDisplay=true 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..547510760 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,8 @@ 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 - +--- tdebase/kcontrol/componentchooser/componentchooser.desktop ++++ tdebase/kcontrol/componentchooser/componentchooser.desktop +@@ -6,3 +6,4 @@ + X-TDE-ParentApp=kcontrol + DocPath=kcontrol/componentchooser/index.html Categories=Qt;TDE;X-TDE-settings-components; +NoDisplay=true -- cgit v1.2.3 From a420847f9932a557b7bae0803751cd6076e054e7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Jan 2014 02:19:15 -0600 Subject: Fix prior commit --- .../debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 4 ++-- .../debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 4 ++-- .../debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 4 ++-- 3 files changed, 6 insertions(+), 6 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 547510760..85f30e1ca 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,6 +1,6 @@ diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop ---- tdebase/kcontrol/componentchooser/componentchooser.desktop -+++ tdebase/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 @@ -6,3 +6,4 @@ X-TDE-ParentApp=kcontrol DocPath=kcontrol/componentchooser/index.html 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 547510760..85f30e1ca 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,6 +1,6 @@ diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop ---- tdebase/kcontrol/componentchooser/componentchooser.desktop -+++ tdebase/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 @@ -6,3 +6,4 @@ X-TDE-ParentApp=kcontrol DocPath=kcontrol/componentchooser/index.html 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 547510760..85f30e1ca 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,6 +1,6 @@ diff -Nur tdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop tdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop ---- tdebase/kcontrol/componentchooser/componentchooser.desktop -+++ tdebase/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 @@ -6,3 +6,4 @@ X-TDE-ParentApp=kcontrol DocPath=kcontrol/componentchooser/index.html -- cgit v1.2.3 From 72f974214d634708b1449a80565ab6ed08ccd6d3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Jan 2014 02:33:07 -0600 Subject: Third attempt at fixing tdebase FTBFS on Ubuntu --- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 13 ++++++++----- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 13 ++++++++----- .../patches/kubuntu_78_kcontrol_hide_component_chooser.diff | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 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 85f30e1ca..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 -@@ -6,3 +6,4 @@ +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 + 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 85f30e1ca..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 -@@ -6,3 +6,4 @@ +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 + 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 85f30e1ca..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 -@@ -6,3 +6,4 @@ +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 + DocPath=kcontrol/componentchooser/index.html Categories=Qt;TDE;X-TDE-settings-components; +NoDisplay=true + + Name=Default Applications + Name[af]=Verstektoepassings -- cgit v1.2.3