From 4767b848fa80a0329574ae349da52dc64071ae29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 8 Mar 2014 12:55:11 +0100 Subject: Remove obsolete patch in kiosktool on Ubuntu --- .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 13 ------------- .../maverick/applications/kiosktool/debian/patches/series | 1 - .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 13 ------------- ubuntu/precise/applications/kiosktool/debian/patches/series | 1 - .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 13 ------------- ubuntu/raring/applications/kiosktool/debian/patches/series | 1 - 6 files changed, 42 deletions(-) delete mode 100644 ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff delete mode 100644 ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff delete mode 100644 ubuntu/raring/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff deleted file mode 100644 index 77f7d912f..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- kiosktool/kiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 -+++ kiosktool/kiosktool/menueditComponent.cpp 2005-12-18 14:45:26.000000000 +0000 -@@ -104,8 +104,8 @@ - { - bool result; - TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu"); -- TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu"); -- TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu"); -+ TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu"); -+ TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu"); - - kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl; - kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl; diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/series b/ubuntu/maverick/applications/kiosktool/debian/patches/series index f33e94505..f6cd6dac1 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/series +++ b/ubuntu/maverick/applications/kiosktool/debian/patches/series @@ -1,2 +1 @@ -kubuntu_02_kmenu.diff kubuntu_03_sudo_support.diff diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff deleted file mode 100644 index 77f7d912f..000000000 --- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- kiosktool/kiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 -+++ kiosktool/kiosktool/menueditComponent.cpp 2005-12-18 14:45:26.000000000 +0000 -@@ -104,8 +104,8 @@ - { - bool result; - TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu"); -- TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu"); -- TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu"); -+ TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu"); -+ TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu"); - - kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl; - kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl; diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/series b/ubuntu/precise/applications/kiosktool/debian/patches/series index f33e94505..f6cd6dac1 100644 --- a/ubuntu/precise/applications/kiosktool/debian/patches/series +++ b/ubuntu/precise/applications/kiosktool/debian/patches/series @@ -1,2 +1 @@ -kubuntu_02_kmenu.diff kubuntu_03_sudo_support.diff diff --git a/ubuntu/raring/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/raring/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff deleted file mode 100644 index 77f7d912f..000000000 --- a/ubuntu/raring/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- kiosktool/kiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 -+++ kiosktool/kiosktool/menueditComponent.cpp 2005-12-18 14:45:26.000000000 +0000 -@@ -104,8 +104,8 @@ - { - bool result; - TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu"); -- TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu"); -- TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu"); -+ TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu"); -+ TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu"); - - kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl; - kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl; diff --git a/ubuntu/raring/applications/kiosktool/debian/patches/series b/ubuntu/raring/applications/kiosktool/debian/patches/series index f33e94505..f6cd6dac1 100644 --- a/ubuntu/raring/applications/kiosktool/debian/patches/series +++ b/ubuntu/raring/applications/kiosktool/debian/patches/series @@ -1,2 +1 @@ -kubuntu_02_kmenu.diff kubuntu_03_sudo_support.diff -- cgit v1.2.3