diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 02:09:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 02:09:17 -0600 |
| commit | d650e8b10a7869610b6c40213a941f9b744dfd3f (patch) | |
| tree | 2aeb98466830443519f838ab520cb0548912c24b /ubuntu/maverick/applications/kiosktool/debian/patches | |
| parent | ce12f9fa05fe43b5878f3189e747e31bbb60c7f7 (diff) | |
| download | tde-packaging-d650e8b10a7869610b6c40213a941f9b744dfd3f.tar.gz tde-packaging-d650e8b10a7869610b6c40213a941f9b744dfd3f.zip | |
Use new tdeio names on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/applications/kiosktool/debian/patches')
| -rw-r--r-- | ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff | 10 |
2 files changed, 7 insertions, 7 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 index 77f7d912f..b1e39b1d4 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/kiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 -+++ kiosktool/kiosktool/menueditComponent.cpp 2005-12-18 14:45:26.000000000 +0000 +--- kiosktool/tdeiosktool/menueditComponent.cpp 2005-04-25 09:46:33.000000000 +0000 ++++ kiosktool/tdeiosktool/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 eb8ca9a1b..e7b9121ef 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/kiosktool/kioskrun.h 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/kiosktool/kioskrun.h 2007-07-18 17:47:04.000000000 +0100 +--- kiosktool/tdeiosktool/tdeioskrun.h 2005-04-25 10:46:33.000000000 +0100 ++++ kiosktool/tdeiosktool/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/kiosktool/kioskrun.cpp 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/kiosktool/kioskrun.cpp 2007-07-20 16:56:07.000000000 +0100 +--- kiosktool/tdeiosktool/tdeioskrun.cpp 2005-04-25 10:46:33.000000000 +0100 ++++ kiosktool/tdeiosktool/tdeioskrun.cpp 2007-07-20 16:56:07.000000000 +0100 @@ -28,6 +28,7 @@ #include <tqdir.h> @@ -32,7 +32,7 @@ @@ -45,10 +46,124 @@ #include "kiosksync.h" - #include <kio/netaccess.h> + #include <tdeio/netaccess.h> -#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 +// #define NETACCESS KIO::NetAccess |