summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/applications')
-rw-r--r--ubuntu/maverick/applications/digikam/debian/copyright2
-rw-r--r--ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install4
-rw-r--r--ubuntu/maverick/applications/k3b/debian/libk3b3.install4
-rwxr-xr-xubuntu/maverick/applications/kio-apt/debian/rules6
-rw-r--r--ubuntu/maverick/applications/kio-umountwrapper/debian/control2
-rwxr-xr-xubuntu/maverick/applications/kio-umountwrapper/debian/rules16
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.14
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.14
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages4
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff4
-rw-r--r--ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff10
-rwxr-xr-xubuntu/maverick/applications/krusader/debian/rules4
-rw-r--r--ubuntu/maverick/applications/ksquirrel/debian/README.debian2
-rw-r--r--ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install2
14 files changed, 34 insertions, 34 deletions
diff --git a/ubuntu/maverick/applications/digikam/debian/copyright b/ubuntu/maverick/applications/digikam/debian/copyright
index bc06dd076..f46c77c80 100644
--- a/ubuntu/maverick/applications/digikam/debian/copyright
+++ b/ubuntu/maverick/applications/digikam/debian/copyright
@@ -139,7 +139,7 @@ digikam/
o from tdefiletip source copies (tdebase, konqueror)
© 1998, 1999 Torben Weis <[email protected]>
© 2000, 2001, 2002 David Faure <[email protected]>
- o Concept copied from tdelibs/kio/kio/netaccess.h/cpp
+ o Concept copied from tdelibs/tdeio/tdeio/netaccess.h/cpp
© 1997 Torben Weis ([email protected])
© 1998 Matthias Ettrich ([email protected])
© 1999 David Faure ([email protected])
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
index e18a34c1c..b316f577e 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
@@ -23,5 +23,5 @@ debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.so
debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.la
debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.so
debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/opt/trinity/lib/trinity/kio_videodvd.so
-debian/tmp/opt/trinity/lib/trinity/kio_videodvd.la
+debian/tmp/opt/trinity/lib/trinity/tdeio_videodvd.so
+debian/tmp/opt/trinity/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3.install b/ubuntu/maverick/applications/k3b/debian/libk3b3.install
index f5c557815..69b7f7909 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3.install
@@ -21,5 +21,5 @@ debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so
debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la
debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so
debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la
-debian/tmp/usr/lib/trinity/kio_videodvd.so
-debian/tmp/usr/lib/trinity/kio_videodvd.la
+debian/tmp/usr/lib/trinity/tdeio_videodvd.so
+debian/tmp/usr/lib/trinity/tdeio_videodvd.la
diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules
index 93f63f8ee..f9ce7782e 100755
--- a/ubuntu/maverick/applications/kio-apt/debian/rules
+++ b/ubuntu/maverick/applications/kio-apt/debian/rules
@@ -29,10 +29,10 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-configure/kio-apt-trinity::
+configure/tdeio-apt-trinity::
#fix rpath issue
# -chmod +x debian/fixrpath
# debian/fixrpath $(DEB_BUILDDIR)
-install/kio-apt-trinity::
- uudecode debian/kdedeb_logo.png.uu -o $(DEB_DESTDIR)/opt/trinity/share/apps/kio_apt/kdedeb_logo.png
+install/tdeio-apt-trinity::
+ uudecode debian/kdedeb_logo.png.uu -o $(DEB_DESTDIR)/opt/trinity/share/apps/tdeio_apt/kdedeb_logo.png
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/control b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
index cbd222b49..af0b21f42 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/control
@@ -14,4 +14,4 @@ Description: progress dialog for safely removing devices in Trinity.
Wrapper around kio_media_mountwrapper.
Provides a progress dialog for Safely Removing of devices in Trinity.
.
- Homepage: http://frode.kde.no/misc/kio_umountwrapper/
+ Homepage: http://frode.kde.no/misc/tdeio_umountwrapper/
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
index 6672eae5b..ddfd17b35 100755
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
@@ -31,19 +31,19 @@ debian/stamp-bootstrap:
common-post-build-arch::
XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages
-install/kio-umountwrapper-trinity::
- mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
+install/tdeio-umountwrapper-trinity::
+ mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
+ $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/konqueror/servicemenus/
- mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
+ mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
+ $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/dolphin/servicemenus/
- mkdir -p $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
+ mkdir -p $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
cp $(CURDIR)/debian/media_safelyremove.desktop \
- $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
+ $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/d3lphin/servicemenus/
clean::
- rm -rf $(CURDIR)/debian/kio-umountwrapper-trinity/opt/trinity/share/apps/
+ rm -rf $(CURDIR)/debian/tdeio-umountwrapper-trinity/opt/trinity/share/apps/
rm -f po/*.pot
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 <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
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules
index b19073807..f2fc8f971 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/maverick/applications/krusader/debian/rules
@@ -44,8 +44,8 @@ install/krusader-trinity::
install -D -p -m0644 pics/cr32-app-krusader_user.xpm \
$(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm
# install properly kio_isorc
- install -D -p -m0644 iso/kio_isorc \
- $(DEB_DESTDIR)/opt/trinity/share/config/kio_isorc
+ install -D -p -m0644 iso/tdeio_isorc \
+ $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc
# install lintian override
install -D -p -m0644 debian/krusader.lintian-overrides \
$(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/README.debian b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
index c580229d7..5e7bd078a 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/README.debian
+++ b/ubuntu/maverick/applications/ksquirrel/debian/README.debian
@@ -4,7 +4,7 @@ exif support is disabled. That library depends on tdelibs3.
MT is enabled because configure seems not smart enough.
Qt version coded in configure.in.in
-Hard-coded dependency on libkio.la (in tdelibs4-dev)
+Hard-coded dependency on libtdeio.la (in tdelibs4-dev)
Hard-coded dependency on dcopidl
-- Paul Gevers <[email protected]> Sun, 14 Sep 2008 10:17:50 -0500
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
index edba29129..79f9eff3d 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/tdeio*
debian/tmp/opt/trinity/lib/trinity/kded_tdesvnd.*
debian/tmp/opt/trinity/share/services/kded/