From a60fb3aff20c1280342b61c6cac80a63a6952aaa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 18:51:31 -0600 Subject: Update Debian and Ubuntu packaging for latest GIT --- .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 4 ++-- .../kiosktool/debian/patches/kubuntu_03_sudo_support.diff | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ubuntu/maverick/applications/kiosktool/debian/patches') diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff index b1e39b1d4..77f7d912f 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff +++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff @@ -1,5 +1,5 @@ ---- kiosktool/tdeiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 -+++ kiosktool/tdeiosktool/menueditComponent.cpp 2005-12-18 14:45:26.000000000 +0000 +--- 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; diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff index e7b9121ef..b5af11a0a 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff +++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff @@ -1,5 +1,5 @@ ---- kiosktool/tdeiosktool/tdeioskrun.h 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/tdeiosktool/tdeioskrun.h 2007-07-18 17:47:04.000000000 +0100 +--- kiosktool/kiosktool/tdeioskrun.h 2005-04-25 10:46:33.000000000 +0100 ++++ kiosktool/kiosktool/tdeioskrun.h 2007-07-18 17:47:04.000000000 +0100 @@ -37,6 +37,18 @@ class KioskGui; @@ -19,8 +19,8 @@ class KioskRun : public TQObject { friend class KioskGui; ---- kiosktool/tdeiosktool/tdeioskrun.cpp 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/tdeiosktool/tdeioskrun.cpp 2007-07-20 16:56:07.000000000 +0100 +--- kiosktool/kiosktool/tdeioskrun.cpp 2005-04-25 10:46:33.000000000 +0100 ++++ kiosktool/kiosktool/tdeioskrun.cpp 2007-07-20 16:56:07.000000000 +0100 @@ -28,6 +28,7 @@ #include @@ -34,7 +34,7 @@ #include -#define NETACCESS KIO::NetAccess -+// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead ++// Kiostdetool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead +// #define NETACCESS KIO::NetAccess #undef DEBUG_ENTRIES @@ -71,7 +71,7 @@ + +TQString NETACCESS::lastErrorString() +{ -+ return "Error in Kiosktool Kubuntu modifications"; ++ return "Error in Kiostdetool Kubuntu modifications"; +} + +int NETACCESS::lastError() -- cgit v1.2.3