diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:01:25 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:01:25 +0100 |
| commit | ac9528cdc30a02a5de9bee61d984ce5e887738db (patch) | |
| tree | da0d46e2887ebd9ff3322d7b5c751d29b2086085 /ubuntu/maverick/applications/kiosktool/debian | |
| parent | 86edbad7c86151df1ff3ba015b466a634920e3e7 (diff) | |
| parent | f923c3ffdf627da3a7637db245b24b9f29f7c6a1 (diff) | |
| download | tde-packaging-ac9528cdc30a02a5de9bee61d984ce5e887738db.tar.gz tde-packaging-ac9528cdc30a02a5de9bee61d984ce5e887738db.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kiosktool/debian')
| -rw-r--r-- | ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff | 13 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kiosktool/debian/patches/series | 1 |
2 files changed, 0 insertions, 14 deletions
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 |