summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 16:11:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 16:11:00 -0600
commitececdc858f22069c896fcc65f091ad098048f69c (patch)
tree05e23975f54097354fea995d8f157f8fc596051e /ubuntu/maverick/tdebase
parenta4a159783f44fec03921e23f58f2625290e8f728 (diff)
downloadtde-packaging-ececdc858f22069c896fcc65f091ad098048f69c.tar.gz
tde-packaging-ececdc858f22069c896fcc65f091ad098048f69c.zip
Rename some instances of kde to tde in Ubuntu and Debian
Diffstat (limited to 'ubuntu/maverick/tdebase')
-rw-r--r--ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES2
-rw-r--r--ubuntu/maverick/tdebase/debian/changelog42
-rw-r--r--ubuntu/maverick/tdebase/debian/control10
-rw-r--r--ubuntu/maverick/tdebase/debian/control.in6
-rw-r--r--ubuntu/maverick/tdebase/debian/copyright4
-rw-r--r--ubuntu/maverick/tdebase/debian/edit-as-root.desktop2
-rw-r--r--ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm2
-rw-r--r--ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm2
-rw-r--r--ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm2
-rw-r--r--ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm2
-rw-r--r--ubuntu/maverick/tdebase/debian/kate-trinity.install4
-rw-r--r--ubuntu/maverick/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/kcontrol-trinity.install4
-rw-r--r--ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kdeprint-trinity.install222
-rw-r--r--ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages2
-rw-r--r--ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu28
-rw-r--r--ubuntu/maverick/tdebase/debian/kdesktop-trinity.install2
-rw-r--r--ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install4
-rw-r--r--ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kicker-trinity.install10
-rw-r--r--ubuntu/maverick/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/klipper-trinity.install2
-rw-r--r--ubuntu/maverick/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install4
-rw-r--r--ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdebase/debian/konqueror-trinity.install6
-rw-r--r--ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/konsole-trinity.install2
-rw-r--r--ubuntu/maverick/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.install2
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.install8
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.14
-rw-r--r--ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.110
-rw-r--r--ubuntu/maverick/tdebase/debian/man/kdesu-trinity.118
-rw-r--r--ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.12
-rw-r--r--ubuntu/maverick/tdebase/debian/man/kprinter-trinity.12
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff4
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff6
-rwxr-xr-xubuntu/maverick/tdebase/debian/rules6
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint6
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install20
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages2
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install52
50 files changed, 293 insertions, 293 deletions
diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 2a94294ef..5d776fe2d 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
@@ -24,7 +24,7 @@ binary-install/tdebase-bin::
install -p -D -m644 debian/ubuntu.xmodmap debian/tdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap
install -p -D -m644 debian/80ubuntu-xmodmap debian/tdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap
---with-sudo-kdesu-backend
+--with-sudo-tdesu-backend
XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index 348bfd069..b991c3875 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -635,7 +635,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low
+++ Changes by Sune Vuorela:
- * Add smbclient to suggests of kdeprint to show that it is needed to make
+ * Add smbclient to suggests of tdeprint to show that it is needed to make
smb printers work. Also adapt the description. (Closes: #445182)
* Lower gdb recommends to a suggests now that recommends get installed by
default. (Closes: 442432)
@@ -866,7 +866,7 @@ tdebase (4:3.5.7-1ubuntu10) gutsy; urgency=low
* Added kubuntu_99_kate_crashfix_from_svn.diff. (LP: #122296)
* Committed into Bzr.
- * Added gs-esp-x to kdeprint depends and konqueror depends. (LP: #83597)
+ * Added gs-esp-x to tdeprint depends and konqueror depends. (LP: #83597)
* Added konqueror Recommends: libxine1-ffmpeg, so that the thumbnail
generation no longer fails on video files. (LP: #51024)
* Added konqueror Recommends: libarts1-mpeglib, so that the thumbnail
@@ -1050,7 +1050,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
- Simplified chinese thanks to Ming Hua. (Closes: #418486)
- Malayam thanks to Praveen A. (Closes: #418495)
- Greek (still has a couple of fuzzy strings).
- * Add a patch to put some quotes in kdeprintgfax to have spaces in
+ * Add a patch to put some quotes in tdeprintgfax to have spaces in
names/numbers. Thanks to Robert Cheramy. (Closes: #247396)
* Fix minor issues in manpage. Thanks JS Bygott. (Closes: #414270)
* Enable kerberos in kio slaves. It seems do not break anything.
@@ -1347,7 +1347,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low
tdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low
- * Compile with --with-sudo-kdesu-backend
+ * Compile with --with-sudo-tdesu-backend
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Nov 2006 10:18:52 +0000
@@ -1425,7 +1425,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
+++ Changes by Sune Vuorela:
- * Add a section to man page about how to use sudo as kdesu backend
+ * Add a section to man page about how to use sudo as tdesu backend
(Closes: #399823, #384416)
+++ Changes by Ana Guerrero:
@@ -1713,13 +1713,13 @@ tdebase (4:3.5.5-0ubuntu1) edgy; urgency=low
* 28_tdebase_rubberband.diff now kubuntu_28_tdebase_rubberband.diff and hunk
removed to apply
* kubuntu_14_hide_konquerorsu_menu_entry.diff updated
- * kubuntu_20_kdesu_sudo.diff updated, merged upstream
+ * kubuntu_20_tdesu_sudo.diff updated, merged upstream
* kubuntu_35_hide_klipper_menu_entry.diff updated
* kubuntu_73_nomediaioslave_mounthelper.diff updated
* kubuntu_75_kicker_taskbar_resize.diff removed, fixed upstream
* kubuntu_76_kickermedia.diff updated
* kubuntu_83_media_desktop.diff updated
- * Use --with-sudo-kdesu-backend and build-dep on sudo
+ * Use --with-sudo-tdesu-backend and build-dep on sudo
-- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:06 +0000
@@ -2232,7 +2232,7 @@ tdebase (4:3.5.2-0ubuntu23) dapper; urgency=low
tdebase (4:3.5.2-0ubuntu22) dapper; urgency=low
- * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu
+ * Update kubuntu_20_tdesu_sudo.diff to fix run as foo message in tdesu
with -u switch (Closes: Malone #41184)
-- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 12:12:44 +0200
@@ -2294,7 +2294,7 @@ tdebase (4:3.5.2-0ubuntu14) dapper; urgency=low
* Removed system tab from konqueror's sidebar
* Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of
gtk_qt_engine if gnome or xfce are already installed (Malone #36256)
- * Added kubuntu_61_kdeprint_admin.diff, makes kdeprint admin mode work
+ * Added kubuntu_61_tdeprint_admin.diff, makes tdeprint admin mode work
(Malone #39867)
-- Anthony Mercatante <tonio@ubuntu.com> Mon, 24 Apr 2006 21:16:19 +0200
@@ -2503,7 +2503,7 @@ tdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
tdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
- * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
+ * Add kubuntu_43_tdesu_terminal_output.diff to make tdesu
have terminal output
* Remove xlibs-static-pic from build-deps
@@ -2605,7 +2605,7 @@ tdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
duplicate printer .desktop files
* Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default
* Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing
- * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax
+ * Add kubuntu_37_hide_tdeprintfax_menu_entry.diff tdeprintfax
is available when printing with Print to Fax
-- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 21:51:29 +0000
@@ -2848,7 +2848,7 @@ tdebase (4:3.4.1-1) experimental; urgency=low
tdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low
- * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator
+ * Add kubuntu_34_tdesu_sycoca_cache_path.diff fix administrator
kcontrol module bug http://bugzilla.ubuntu.com/8681
-- Jonathan Riddell <jriddell@ubuntu.com> Wed, 2 Nov 2005 02:37:11 +0000
@@ -3069,7 +3069,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
fail when kpersonalizer is not present. (Closes: #309803)
* Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
- down) and my own manpage for kdesu/kdesud. (Closes: #239945)
+ down) and my own manpage for tdesu/tdesud. (Closes: #239945)
+++ Changes by Adeodato Simó:
@@ -3090,7 +3090,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
* Fix typo in tdebase-bin description. (Closes: #286587)
- * Update kdeprint documentation to sync with tdelibs patches.
+ * Update tdeprint documentation to sync with tdelibs patches.
* Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
problem when upgrading to KDE 3.3, and how to deal with it.
@@ -3107,8 +3107,8 @@ tdebase (4:3.3.2-1) unstable; urgency=low
+++ Changes by Adeodato Simó:
* debian/control:
- - make tdebase-dev depend on kwin for the libkdecorations.so ->
- libkdecorations.so.1.0.0 symlink. (Closes: #289544)
+ - make tdebase-dev depend on kwin for the libtdecorations.so ->
+ libtdecorations.so.1.0.0 symlink. (Closes: #289544)
* Included Czech po-debconf translation by Miroslav Kure.
(Closes: #289454)
@@ -3153,7 +3153,7 @@ tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low
tdebase (4:3.4.0-0ubuntu16) hoary; urgency=low
- * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo.
+ * Add kubuntu_20_tdesu_sudo.diff to fix string on tdesu for sudo.
Fixes http://bugzilla.ubuntu.com/7327
-- Jonathan Riddell <jr@jriddell.org> Sat, 2 Apr 2005 17:01:37 +0100
@@ -3311,7 +3311,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
* New upstream release.
* KDE_3_3_BRANCH update. Includes the tdebase part of the fix
for CAN-2004-1158.
- * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+ * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
* kwin is now registered as an x-window-manager. (Closes: #249162)
* Added /usr/share/xsessions to KDM's default session path, so
.desktop files installed there are found.
@@ -3498,7 +3498,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low
* Added patch to update autotools files.
* Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
causes configure checks to fail due to #line numbers being > 32767.
- * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
+ * Demote tdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
(Closes: #142489)
* Change kicker.menu-method to not display the empty_mime icon if a menu file
doesn't provide an icon. (Closes: #154065)
@@ -3540,7 +3540,7 @@ tdebase (4:3.1.2-1) unstable; urgency=low
* New upstream release.
* Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
* Add libkregexpeditor to kate Recommends. (Closes: #183280)
- * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489)
+ * Add efax | hylafax | mgetty-fax to tdeprint Depends. (Closes: #142489)
* Add kfind to konqueror Depends. (Closes: #192859)
* Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438,
#193274)
@@ -4289,7 +4289,7 @@ tdebase (4:2.1-beta2-0128-1) unstable; urgency=low
tdebase (4:2.1-beta2-3) unstable; urgency=low
* Don't crash when trying to load/read faulty plugins (Closes: #82983)
- * Moving kdesu to tdebase-libs so that we can use it without needing
+ * Moving tdesu to tdebase-libs so that we can use it without needing
tdebase installed
* Adding autoconf and gettext to build-deps
* Several small bug fixes from upstream
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 5718cf914..13b0f584b 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: kde
Architecture: all
Replaces: tdebase-kde3 (<< 4:3.5.13)
Breaks: tdebase-kde3 (<< 4:3.5.13)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), kdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
@@ -140,7 +140,7 @@ Section: devel
Architecture: any
Replaces: tdebase-kde3-dev (<< 4:3.5.13)
Breaks: tdebase-kde3-dev (<< 4:3.5.13)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), kdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the KDE base module
This package contains headers and other development files needed to
compile software based on the KDE base module.
@@ -215,11 +215,11 @@ Description: password changer for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
-Package: kdeprint-trinity
+Package: tdeprint-trinity
Section: utils
Architecture: any
-Replaces: kdeprint-kde3 (<< 4:3.5.13)
-Breaks: kdeprint-kde3 (<< 4:3.5.13)
+Replaces: tdeprint-kde3 (<< 4:3.5.13)
+Breaks: tdeprint-kde3 (<< 4:3.5.13)
Depends: ${shlibs:Depends}, enscript, poster, psutils
Recommends: kghostview-trinity | postscript-viewer
Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index c23253584..107c75b66 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
Package: tdebase
Section: kde
Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
Recommends: kdm (>= ${Source-Version})
Suggests: tdebase-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
Package: tdebase-dev
Section: devel
Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
Description: development files for the KDE base module
This package contains headers and other development files needed to
@@ -191,7 +191,7 @@ Description: password changer for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde' and 'tdebase' packages for more information.
-Package: kdeprint
+Package: tdeprint
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, enscript, poster, psutils
diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright
index 8e0933735..a17edd5c2 100644
--- a/ubuntu/maverick/tdebase/debian/copyright
+++ b/ubuntu/maverick/tdebase/debian/copyright
@@ -16,7 +16,7 @@ headings and other identifying marks.
Artistic
--------
-kdcop, kdesu, klipper
+kdcop, tdesu, klipper
BSD
---
@@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport
GPL
---
-kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit,
+kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit,
konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
diff --git a/ubuntu/maverick/tdebase/debian/edit-as-root.desktop b/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
index 049454ea0..e3df17006 100644
--- a/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
+++ b/ubuntu/maverick/tdebase/debian/edit-as-root.desktop
@@ -9,4 +9,4 @@ Name[fr]=Editer en tant que Root
Name[es]=Editar como Root
Name[de]=Als root bearbeiten
Icon=kfm
-Exec=kdesu "kwrite" "%U"
+Exec=tdesu "kwrite" "%U"
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..58b87a90d 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kdeprint-16[] = {
+static char *tdeprint-16[] = {
/* columns rows colors chars-per-pixel */
"16 16 137 2",
" c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
index f11005860..c10da523c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kdeprint[] = {
+static char *tdeprint[] = {
/* columns rows colors chars-per-pixel */
"32 32 130 2",
" c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..3e07385e5 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kdeprintfax-16[] = {
+static char *tdeprintfax-16[] = {
/* columns rows colors chars-per-pixel */
"16 16 168 2",
" c black",
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..9f5d6a2e7 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
+++ b/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kdeprintfax[] = {
+static char *tdeprintfax[] = {
/* columns rows colors chars-per-pixel */
"32 32 94 2",
" c #000000",
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.install b/ubuntu/maverick/tdebase/debian/kate-trinity.install
index bc586a595..3b65dfabc 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.install
@@ -9,8 +9,8 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.so.0
debian/tmp/opt/trinity/lib/libkateinterfaces.so.0.0.0
debian/tmp/opt/trinity/lib/libkateutils.so.0
debian/tmp/opt/trinity/lib/libkateutils.so.0.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kate.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.so
+debian/tmp/opt/trinity/lib/libtdeinit_kate.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.so
debian/tmp/opt/trinity/share/applications/kde/kate.desktop
debian/tmp/opt/trinity/share/applications/kde/kwrite.desktop
debian/tmp/opt/trinity/share/apps/kate/externaltools
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
index fcc9b79aa..0ad1f24b6 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
-kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
+kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
+kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index f337002f6..71527a0c5 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -124,8 +124,8 @@ debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.so
debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.so
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
debian/tmp/opt/trinity/lib/libkfontinst.so.0
debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/arts.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..d18964b2d 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
+kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
+kcontrol: shlib-missing-in-control-file libtdeinit_krandrinithack.so usr/lib/libtdeinit_krandrinithack.so
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
index bd25acf54..69f67a958 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/bin/kdeprintfax
+debian/tmp/opt/trinity/bin/tdeprintfax
debian/tmp/opt/trinity/bin/kjobviewer
debian/tmp/opt/trinity/bin/kprinter
debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
@@ -9,126 +9,126 @@ debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
debian/tmp/opt/trinity/lib/trinity/kprinter.la
debian/tmp/opt/trinity/lib/trinity/kprinter.so
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.la
-debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.so
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.so
-debian/tmp/opt/trinity/share/applications/kde/kdeprintfax.desktop
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.la
+debian/tmp/opt/trinity/lib/trinity/libtdeprint_part.so
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.so
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.so
+debian/tmp/opt/trinity/share/applications/kde/tdeprintfax.desktop
debian/tmp/opt/trinity/share/applications/kde/kjobviewer.desktop
debian/tmp/opt/trinity/share/applications/kde/printers.desktop
-debian/tmp/opt/trinity/share/apps/kdeprintfax/anytops
-debian/tmp/opt/trinity/share/apps/kdeprintfax/faxfilters
-debian/tmp/opt/trinity/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
-debian/tmp/opt/trinity/share/apps/kdeprintfax/kdeprintfaxui.rc
-debian/tmp/opt/trinity/share/apps/kdeprint_part/kdeprint_part.rc
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bar-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-bottom-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-centre-kdeprint.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-middle-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/box-top-right.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/class.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/driver.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/htmlstyles.css
-debian/tmp/opt/trinity/share/apps/kdeprint/template/jobs.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/printer.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/pseudo.template
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-left.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-middle.png
-debian/tmp/opt/trinity/share/apps/kdeprint/template/top-right-kdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/anytops
+debian/tmp/opt/trinity/share/apps/tdeprintfax/faxfilters
+debian/tmp/opt/trinity/share/apps/tdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
+debian/tmp/opt/trinity/share/apps/tdeprintfax/tdeprintfaxui.rc
+debian/tmp/opt/trinity/share/apps/tdeprint_part/tdeprint_part.rc
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bar-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-bottom-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-centre-tdeprint.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-middle-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/box-top-right.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/class.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/driver.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/htmlstyles.css
+debian/tmp/opt/trinity/share/apps/tdeprint/template/jobs.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/printer.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/pseudo.template
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-left.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-middle.png
+debian/tmp/opt/trinity/share/apps/tdeprint/template/top-right-tdeprint.png
debian/tmp/opt/trinity/share/apps/kjobviewer/kjobviewerui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsoptions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/extensions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/external-command.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/final-word.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/getting-started.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/highlights.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lpr-bsd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/lprng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/ps-boxes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/rlpr.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/tech-overview.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdeprint/theory.docbook
-debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/add-printer-wiz.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cr32-action-wizard.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard1.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-config.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsoptions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/extensions.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/external-command.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/final-word.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/getting-started.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/highlights.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcron_to_be_printed.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tdeprint-jobviewer.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_called_from_run_command.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-kivio.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpr-bsd.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lprng.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/ps-boxes.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/rlpr.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/steinbruch_scaled.png
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tech-overview.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdeprintfax.png
+debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/tdeprintfax.png
debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kjobviewer.png
debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/printmgr.png
-debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdeprintfax.svgz
+debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
@@ -138,13 +138,13 @@ debian/tmp/opt/trinity/share/mimelnk/print/jobs.desktop
debian/tmp/opt/trinity/share/mimelnk/print/manager.desktop
debian/tmp/opt/trinity/share/mimelnk/print/printer.desktop
debian/tmp/opt/trinity/share/mimelnk/print/printermodel.desktop
-debian/tmp/opt/trinity/share/services/kdeprint_part.desktop
+debian/tmp/opt/trinity/share/services/tdeprint_part.desktop
debian/tmp/opt/trinity/share/services/printdb.protocol
debian/tmp/opt/trinity/share/services/print.protocol
debian/icons/kjobviewer.xpm /opt/trinity/share/pixmaps
debian/icons/kjobviewer-16.xpm /opt/trinity/share/pixmaps
-debian/icons/kdeprint.xpm /opt/trinity/share/pixmaps
-debian/icons/kdeprint-16.xpm /opt/trinity/share/pixmaps
-debian/icons/kdeprintfax.xpm /opt/trinity/share/pixmaps
-debian/icons/kdeprintfax-16.xpm /opt/trinity/share/pixmaps
+debian/icons/tdeprint.xpm /opt/trinity/share/pixmaps
+debian/icons/tdeprint-16.xpm /opt/trinity/share/pixmaps
+debian/icons/tdeprintfax.xpm /opt/trinity/share/pixmaps
+debian/icons/tdeprintfax-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..9da8261d7 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so
-kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
-kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
+tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
+tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..55b9bfae7 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
@@ -1,3 +1,3 @@
-debian/man/kdeprintfax-trinity.1
+debian/man/tdeprintfax-trinity.1
debian/man/kjobviewer-trinity.1
debian/man/kprinter-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
index 3140de34c..1268aa55c 100644
--- a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdeprint):\
+?package(tdeprint):\
needs="X11"\
section="Applications/System/Monitoring"\
hints="KDE"\
@@ -7,29 +7,29 @@
icon16x16="/opt/trinity/share/pixmaps/kjobviewer-16.xpm"\
command="/opt/trinity/bin/kjobviewer --show --all"
-?package(kdeprint):\
+?package(tdeprint):\
needs="X11"\
section="Applications/System/Administration"\
hints="KDE"\
title="KPrinter"\
- icon32x32="/opt/trinity/share/pixmaps/kdeprint.xpm"\
- icon16x16="/opt/trinity/share/pixmaps/kdeprint-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/tdeprint.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/tdeprint-16.xpm"\
command="/opt/trinity/bin/kprinter"
-?package(kdeprint):\
+?package(tdeprint):\
needs="X11"\
section="Applications/System/Administration"\
hints="KDE"\
title="KDEPrintFax"\
- icon32x32="/opt/trinity/share/pixmaps/kdeprintfax.xpm"\
- icon16x16="/opt/trinity/share/pixmaps/kdeprintfax-16.xpm"\
- command="/opt/trinity/bin/kdeprintfax"
+ icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
+ command="/opt/trinity/bin/tdeprintfax"
-# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
-# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
+# Icon 32x32 tdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 tdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
-# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm
-# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm
+# Icon 32x32 tdeprint/printmgr/cr32-app-printmgr.png tdeprint.xpm
+# Icon 16x16 tdeprint/printmgr/cr16-app-printmgr.png tdeprint-16.xpm
-# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
-# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm
+# Icon 32x32 tdeprint/tdeprintfax/cr32-app-tdeprintfax.png tdeprintfax.xpm
+# Icon 16x16 tdeprint/tdeprintfax/cr16-app-tdeprintfax.png tdeprintfax-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
index aa950c6d5..8ee3c9256 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
@@ -8,7 +8,7 @@ debian/tmp/opt/trinity/bin/kdesktop_lock
debian/tmp/opt/trinity/bin/kwebdesktop
debian/tmp/opt/trinity/lib/trinity/kdesktop.la
debian/tmp/opt/trinity/lib/trinity/kdesktop.so
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.so
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.so
debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/
debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/
debian/tmp/opt/trinity/share/apps/kdesktop/directory.autostart
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..478f4fbc8 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so
+kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index 8e219a21f..eff975b5d 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/khc_mansearch.pl
debian/tmp/opt/trinity/bin/khelpcenter
debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.so
debian/tmp/opt/trinity/share/applications/kde/Help.desktop
debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
@@ -79,7 +79,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/help.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..44eb5fc11 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
+khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.install b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
index bdd7a8a8b..c99afee75 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
@@ -18,8 +18,8 @@ debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la
debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so
debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.so
debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.la
-debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_tdeprint.so
debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.la
debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.so
debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.la
@@ -59,9 +59,9 @@ debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.la
debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.so
debian/tmp/opt/trinity/lib/libkasbar.so.1
debian/tmp/opt/trinity/lib/libkasbar.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.so
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.so
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.so
debian/tmp/opt/trinity/lib/libkickermain.so.1
debian/tmp/opt/trinity/lib/libkickermain.so.1.0.0
debian/tmp/opt/trinity/lib/libtaskbar.so.1
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
index 41de1be8e..f600f5d82 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so
-kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
+kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
+kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.install b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
index e84bf502b..467dd6710 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper.la
debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
debian/tmp/opt/trinity/lib/trinity/klipper.so
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.so
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.so
debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
index 710a50459..f7bcf9946 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so
+klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
+klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
index 140ea409b..49711b6e4 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/trinity/kcontroledit.la
debian/tmp/opt/trinity/lib/trinity/kcontroledit.so
debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.so
debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
debian/tmp/opt/trinity/share/applnk/System/kmenuedit.desktop
debian/tmp/opt/trinity/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..154077ad9 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
+kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index 11d8a57c1..ece23b00f 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -37,9 +37,9 @@ debian/tmp/opt/trinity/lib/trinity/konqueror.la
debian/tmp/opt/trinity/lib/trinity/konqueror.so
debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.so
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.so
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.so
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.so
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.so
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.so
debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1
debian/tmp/opt/trinity/lib/libkonqsidebarplugin.so.1.2.0
debian/tmp/opt/trinity/share/applications/kde/Home.desktop
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
index 27e528d84..243cafb9f 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so
+konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
+konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
+konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.install b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
index 0fb1e3a22..69e1c7699 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
@@ -7,7 +7,7 @@ debian/tmp/opt/trinity/lib/trinity/konsole.la
debian/tmp/opt/trinity/lib/trinity/konsole.so
debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.so
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.so
debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/kcmkonsole.desktop
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
index 95c2d012e..765754c3e 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so
+konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
+konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
index f5200691f..0946d8a57 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/ksmserver
debian/tmp/opt/trinity/bin/startkde
debian/tmp/opt/trinity/lib/trinity/ksmserver.la
debian/tmp/opt/trinity/lib/trinity/ksmserver.so
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.so
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
index 669919e49..20f94f8ee 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
+ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
+ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
index 6ebdc3c30..a6fde0638 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
@@ -44,10 +44,10 @@ debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
debian/tmp/opt/trinity/lib/trinity/kwin.so
-debian/tmp/opt/trinity/lib/libkdecorations.so.1
-debian/tmp/opt/trinity/lib/libkdecorations.so.1.0.0
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.so
+debian/tmp/opt/trinity/lib/libtdecorations.so.1
+debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.so
debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop
debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
index 1bf281c8a..ab81fccc0 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
-kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so
+kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so
diff --git a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1 b/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..9371c2d9f 100644
--- a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
@@ -34,8 +34,8 @@ The PID of the program
.B \-\-startupid <id>
Startup ID of the program
.TP
-.B \-\-kdeinit
-The program was started by kdeinit
+.B \-\-tdeinit
+The program was started by tdeinit
.TP
.B \-\-safer
Disable arbitrary disk access
diff --git a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..353fb6529 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
@@ -1,12 +1,12 @@
.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
+.TH TDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility"
.SH NAME
-kdeprintfax
+tdeprintfax
\- a interface to fax-packages
.SH SYNOPSIS
-\fBkdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file]
+\fBtdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file]
.SH DESCRIPTION
-\fBkdeprintfax\fP is a small fax utility to be used with kdeprint.
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
.SH OPTIONS
.SS
.SS Arguments:
@@ -148,7 +148,7 @@ sets the client geometry of the main widget \- see man X for the argument format
.SH AUTHORS
.nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
.br
.br
diff --git a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
index e552d288c..8befa3c39 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
@@ -1,16 +1,16 @@
-.TH KDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
+.TH TDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges."
.SH NAME
-kdesu \- Runs a program with elevated privileges.
+tdesu \- Runs a program with elevated privileges.
.SH SYNOPSIS
-\fBkdesu\fR [Qt\-options] [KDE\-options] [kdesu options] command
+\fBtdesu\fR [Qt\-options] [KDE\-options] [tdesu options] command
.SH DESCRIPTION
Runs a program with elevated privileges.
.PP
KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
.PP
-\fBkdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBkdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBkdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBkdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
.PP
-\fBkdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBkdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
.SH OPTIONS
.SS Generic options:
.TP
@@ -35,7 +35,7 @@ Show version information
.B --license
Show license information
.SS
-.SS kdesu Options:
+.SS tdesu Options:
.TP
.TP
.B -c <command>
@@ -78,7 +78,7 @@ Specifies the command to run
.SH CONFIGURATION FILES
.PP
-\fBkdesu\fR can be configured with a default configuration file /etc/trinity/kdesurc and with a per user configuration file in .kde/share/config/kdesurc. Alternative a section could be added to kdeglobals.
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .kde/share/config/tdesurc. Alternative a section could be added to kdeglobals.
.SH EXAMPLE
The configuration item for the configuration files is the following:
.br
@@ -88,9 +88,9 @@ super-user-command=sudo
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdesu/
+.BR help:/tdesu/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kdesu/'"
+.BR "`khelpcenter help:/tdesu/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..04ebe8a44 100644
--- a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
@@ -190,7 +190,7 @@ from the command\-line.
.br
.SH AUTHORS
.nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
.br
.br
diff --git a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
index 340bd84d1..8eaf6c4fb 100644
--- a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
@@ -198,7 +198,7 @@ from the command\-line.
.br
.SH AUTHORS
.nf
-Michael Goffioul <kdeprint@swing.be>
+Michael Goffioul <tdeprint@swing.be>
.br
.fi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
index b647fd41d..620302912 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
@@ -1,5 +1,5 @@
---- tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
-+++ tdebase/kdeprint/kdeprintfax/kdeprintfax.desktop
+--- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
++++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop
@@ -90,3 +90,4 @@
Terminal=false
X-DCOP-ServiceType=Multi
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index c2e139f99..df2cf8cac 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -1,6 +1,6 @@
-diff -Nur tdebase-3.5.4/kdeprint/printmgr/printers.desktop tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop
---- tdebase-3.5.4/kdeprint/printmgr/printers.desktop 2006-07-22 10:15:47.000000000 +0200
-+++ tdebase-3.5.4.new/kdeprint/printmgr/printers.desktop 2006-08-21 22:20:40.000000000 +0200
+diff -Nur tdebase-3.5.4/tdeprint/printmgr/printers.desktop tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop
+--- tdebase-3.5.4/tdeprint/printmgr/printers.desktop 2006-07-22 10:15:47.000000000 +0200
++++ tdebase-3.5.4.new/tdeprint/printmgr/printers.desktop 2006-08-21 22:20:40.000000000 +0200
@@ -219,4 +219,4 @@
Keywords[zh_TW]=print,printer,printing management,列印,印表機,列印管理
Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 036d8f469..da70cfb66 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -21,19 +21,19 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_KDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
DEB_BUILD_PARALLEL = true
DEB_FIXPERMS_EXCLUDE := \
- opt/trinity/bin/kdesud \
+ opt/trinity/bin/tdesud \
opt/trinity/bin/kdmtsak
DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
ksysguard-trinity kwin-trinity libkonq4-trinity
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
index f43d9196b..7610a4313 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
@@ -1,10 +1,10 @@
-Document: tdebase-doc-html-kdeprint
+Document: tdebase-doc-html-tdeprint
Title: KDEPrint Handbook
Author: Kurt Pfeifle
Abstract: KDEPrint is the official printing system of KDE.
Section: Apps/Tools
Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kdeprint/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kdeprint/*.html
+Index: /opt/trinity/share/doc/kde/HTML/en/tdeprint/index.html
+Files: /opt/trinity/share/doc/kde/HTML/en/tdeprint/*.html
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index 2322b0008..fd0d3ac41 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
@@ -13,8 +13,8 @@ debian/tmp/opt/trinity/bin/kcheckpass
debian/tmp/opt/trinity/bin/kcminit
debian/tmp/opt/trinity/bin/kcminit_startup
debian/tmp/opt/trinity/bin/kdcop
-debian/tmp/opt/trinity/bin/kdesu
-debian/tmp/opt/trinity/bin/kdesud
+debian/tmp/opt/trinity/bin/tdesu
+debian/tmp/opt/trinity/bin/tdesud
debian/tmp/opt/trinity/bin/kdialog
debian/tmp/opt/trinity/bin/khotkeys
debian/tmp/opt/trinity/bin/knetattach
@@ -44,11 +44,11 @@ debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.la
debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.so
debian/tmp/opt/trinity/lib/trinity/kxkb.la
debian/tmp/opt/trinity/lib/trinity/kxkb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.so
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.so
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit_startup.so
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.so
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.so
debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1
debian/tmp/opt/trinity/lib/libkhotkeys_shared.so.1.0.0
debian/tmp/opt/trinity/share/applications/kde/keyboard.desktop
@@ -74,9 +74,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
index ae21842e4..2c6c3384a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/kdesu.1.gz opt/trinity/share/man/man1/kdesud.1.gz
+opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
index 1b1985b6d..3f56c6d4a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
+tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
index b801c202a..ebb07daf7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
@@ -4,7 +4,7 @@ debian/man/kcheckpass-trinity.1
debian/man/kcminit-trinity.1
debian/man/kdcop-trinity.1
debian/man/kdebugdialog-trinity.1
-debian/man/kdesu-trinity.1
+debian/man/tdesu-trinity.1
debian/man/kdialog-trinity.1
debian/man/khotkeys-trinity.1
debian/man/kio_system_documenthelper-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
index d9759729d..4328f203e 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
@@ -43,32 +43,32 @@ debian/tmp/opt/trinity/lib/libkateinterfaces.la
debian/tmp/opt/trinity/lib/libkateinterfaces.so
debian/tmp/opt/trinity/lib/libkateutils.la
debian/tmp/opt/trinity/lib/libkateutils.so
-debian/tmp/opt/trinity/lib/libkdecorations.la
-debian/tmp/opt/trinity/lib/libkdecorations.so
-debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_extensionproxy.la
-debian/tmp/opt/trinity/lib/libkdeinit_kaccess.la
-debian/tmp/opt/trinity/lib/libkdeinit_kate.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcminit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.la
-debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.la
-debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.la
-debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.la
-debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_khotkeys.la
-debian/tmp/opt/trinity/lib/libkdeinit_kicker.la
-debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.la
-debian/tmp/opt/trinity/lib/libkdeinit_klipper.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.la
-debian/tmp/opt/trinity/lib/libkdeinit_konqueror.la
-debian/tmp/opt/trinity/lib/libkdeinit_konsole.la
-debian/tmp/opt/trinity/lib/libkdeinit_kprinter.la
-debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/libkdeinit_kwrite.la
-debian/tmp/opt/trinity/lib/libkdeinit_kxkb.la
+debian/tmp/opt/trinity/lib/libtdecorations.la
+debian/tmp/opt/trinity/lib/libtdecorations.so
+debian/tmp/opt/trinity/lib/libtdeinit_appletproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_extensionproxy.la
+debian/tmp/opt/trinity/lib/libtdeinit_kaccess.la
+debian/tmp/opt/trinity/lib/libtdeinit_kate.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcminit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontroledit.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.la
+debian/tmp/opt/trinity/lib/libtdeinit_kdesktop.la
+debian/tmp/opt/trinity/lib/libtdeinit_keditbookmarks.la
+debian/tmp/opt/trinity/lib/libtdeinit_kfmclient.la
+debian/tmp/opt/trinity/lib/libtdeinit_khelpcenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_khotkeys.la
+debian/tmp/opt/trinity/lib/libtdeinit_kicker.la
+debian/tmp/opt/trinity/lib/libtdeinit_kjobviewer.la
+debian/tmp/opt/trinity/lib/libtdeinit_klipper.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmenuedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la
+debian/tmp/opt/trinity/lib/libtdeinit_konsole.la
+debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la
+debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
+debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
debian/tmp/opt/trinity/lib/libkfontinst.la
debian/tmp/opt/trinity/lib/libkfontinst.so
debian/tmp/opt/trinity/lib/libkhotkeys_shared.la