From d650e8b10a7869610b6c40213a941f9b744dfd3f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 02:09:17 -0600 Subject: Use new tdeio names on Debian and Ubuntu --- .../applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 | 4 ++-- .../maverick/applications/kiosktool/debian/kiosktool-trinity.1 | 4 ++-- .../applications/kiosktool/debian/kiosktool-trinity.manpages | 4 ++-- .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 4 ++-- .../kiosktool/debian/patches/kubuntu_03_sudo_support.diff | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'ubuntu/maverick/applications/kiosktool/debian') diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 index e44c4cd99..773b098d6 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 @@ -136,9 +136,9 @@ mirrors the whole layout of widgets. .SH SEE ALSO Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kiosktool\-tdedirs/ +.BR help:/tdeiosktool\-tdedirs/ directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-tdedirs/'" +.BR "`khelpcenter help:/tdeiosktool\-tdedirs/'" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 index 08ba2ec80..d510c0d6b 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 @@ -138,9 +138,9 @@ mirrors the whole layout of widgets. .SH SEE ALSO Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kiosktool/ +.BR help:/tdeiosktool/ directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool/'" +.BR "`khelpcenter help:/tdeiosktool/'" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages index 43bd4d1b8..62e420c43 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages +++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages @@ -1,2 +1,2 @@ -debian/kiosktool-trinity.1 -debian/kiosktool-tdedirs-trinity.1 +debian/tdeiosktool-trinity.1 +debian/tdeiosktool-tdedirs-trinity.1 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 @@ -32,7 +32,7 @@ @@ -45,10 +46,124 @@ #include "kiosksync.h" - #include + #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 +// #define NETACCESS KIO::NetAccess -- cgit v1.2.1