summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/applications/kiosktool
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 18:51:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 18:51:31 -0600
commita60fb3aff20c1280342b61c6cac80a63a6952aaa (patch)
treed66b269fe61e815bc6ac42fede8bdbc46857ca09 /ubuntu/precise/applications/kiosktool
parent41d4f7f49b1289a5186248b60ac8d736e77cba99 (diff)
downloadtde-packaging-a60fb3aff20c1280342b61c6cac80a63a6952aaa.tar.gz
tde-packaging-a60fb3aff20c1280342b61c6cac80a63a6952aaa.zip
Update Debian and Ubuntu packaging for latest GIT
Diffstat (limited to 'ubuntu/precise/applications/kiosktool')
-rw-r--r--ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.14
-rw-r--r--ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.14
-rw-r--r--ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages4
-rw-r--r--ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff4
-rw-r--r--ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff12
5 files changed, 14 insertions, 14 deletions
diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
index 773b098d6..e44c4cd99 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
+++ b/ubuntu/precise/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:/tdeiosktool\-tdedirs/
+.BR help:/kiosktool\-tdedirs/
directly into konqueror or you can run
-.BR "`khelpcenter help:/tdeiosktool\-tdedirs/'"
+.BR "`khelpcenter help:/kiosktool\-tdedirs/'"
from the command\-line.
.br
.SH AUTHORS
diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1
index d510c0d6b..08ba2ec80 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/precise/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:/tdeiosktool/
+.BR help:/kiosktool/
directly into konqueror or you can run
-.BR "`khelpcenter help:/tdeiosktool/'"
+.BR "`khelpcenter help:/kiosktool/'"
from the command\-line.
.br
.SH AUTHORS
diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
index 62e420c43..43bd4d1b8 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -1,2 +1,2 @@
-debian/tdeiosktool-trinity.1
-debian/tdeiosktool-tdedirs-trinity.1
+debian/kiosktool-trinity.1
+debian/kiosktool-tdedirs-trinity.1
diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index b1e39b1d4..77f7d912f 100644
--- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/precise/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/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index e7b9121ef..b5af11a0a 100644
--- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/precise/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 <tqdir.h>
@@ -34,7 +34,7 @@
#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
++// 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()