Update Debian and Ubuntu packaging with the latest renaming in GIT

10 files changed, 96 insertions, 96 deletions

diff --git a/debian/wheezy/tdeadmin/debian/changelog b/debian/wheezy/tdeadmin/debian/changelog
index 4fca9af79..2a7c44e06 100644
--- a/debian/wheezy/tdeadmin/debian/changelog
+++ b/debian/wheezy/tdeadmin/debian/changelog
@@ -44,9 +44,9 @@ tdeadmin (4:3.5.9-0ubuntu5) hardy; urgency=low
 tdeadmin (4:3.5.9-0ubuntu4) hardy; urgency=low
 
   * Added kubuntu_13_no_samba_tweak.diff.
-    Knetworkconf reads smb.conf parameters but doesn't write them
+    Knetwortdeconf reads smb.conf parameters but doesn't write them
     causing the parameters to be removed from the config file.
-    Knetworkconf doesn't allow changing those, so there is no reason
+    Knetwortdeconf doesn't allow changing those, so there is no reason
     to let it read them.
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 03 Apr 2008 15:30:44 +0200
@@ -60,7 +60,7 @@ tdeadmin (4:3.5.9-0ubuntu3) hardy; urgency=low
 
 tdeadmin (4:3.5.9-0ubuntu2) hardy; urgency=low
 
-  * Add kubuntu_11_knetworkconf_icons.diff from Adam Spain, 
+  * Add kubuntu_11_knetwortdeconf_icons.diff from Adam Spain, 
     closes LP: #93878  "low quality icons"
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Mar 2008 14:20:34 +0000
@@ -81,8 +81,8 @@ tdeadmin (4:3.5.8-1ubuntu1) hardy; urgency=low
 
   * Merge with Debian, remaining changes
    - kubuntu_08_kpackage_sudo.diff, sudo support
-   - kubuntu_10_knetworkconf_localhost.diff, LP #66813
-  * Add kubuntu_11_knetworkconf_8.04.diff for 8.04 detection in knetworkconf
+   - kubuntu_10_knetwortdeconf_localhost.diff, LP #66813
+  * Add kubuntu_11_knetwortdeconf_8.04.diff for 8.04 detection in knetwortdeconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Nov 2007 17:25:38 +0000
 
@@ -135,7 +135,7 @@ tdeadmin (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:
 
-  * knetworkconf RC bug fix: recognize allow-* statements in
+  * knetwortdeconf RC bug fix: recognize allow-* statements in
     /etc/network/interfaces as stanzas, not as ordinary options. This
     misrecognition led to corruption of the interfaces file in case allow-*
     stanza followed the iface stanza that new options were added to. Patch
@@ -179,7 +179,7 @@ tdeadmin (4:3.5.5-2) unstable; urgency=low
 tdeadmin (4:3.5.6-0ubuntu1) feisty; urgency=low
 
   * New upstream release
-  * Remove kubuntu_12_knetworkconf_feisty.diff, applied upstream
+  * Remove kubuntu_12_knetwortdeconf_feisty.diff, applied upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 17 Jan 2007 11:22:29 +0000
 
@@ -192,8 +192,8 @@ tdeadmin (4:3.5.5-1ubuntu4) feisty; urgency=low
 
 tdeadmin (4:3.5.5-1ubuntu3) feisty; urgency=low
 
-  * Added kubuntu_12_knetworkconf_feisty.diff to properly autodetect
-    feisty as knetworkconf backend.
+  * Added kubuntu_12_knetwortdeconf_feisty.diff to properly autodetect
+    feisty as knetwortdeconf backend.
 
  -- Luka Renko <lure@ubuntu.com>  Sun, 10 Dec 2006 16:16:12 +0100
 
@@ -235,7 +235,7 @@ tdeadmin (4:3.5.4-1) unstable; urgency=low
 
 tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 
-  * kubuntu_10_knetworkconf_localhost.diff added, hostname should not 
+  * kubuntu_10_knetwortdeconf_localhost.diff added, hostname should not 
     be appended as alias to localhost in /etc/hosts
     Closes Malone #66813
 
@@ -244,7 +244,7 @@ tdeadmin (4:3.5.5-0ubuntu2) edgy; urgency=low
 tdeadmin (4:3.5.5-0ubuntu1) edgy; urgency=low
 
   * New upstream release
-  * kubuntu_09_networkconf_edgy.diff removed, merged upstream
+  * kubuntu_09_networtdeconf_edgy.diff removed, merged upstream
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  3 Oct 2006 10:56:07 +0000
 
@@ -257,7 +257,7 @@ tdeadmin (4:3.5.4-0ubuntu3) edgy; urgency=low
 
 tdeadmin (4:3.5.4-0ubuntu2) edgy; urgency=low
 
-  * Add kubuntu_09_networkconf_edgy.diff to support Edgy in knetworkconf
+  * Add kubuntu_09_networtdeconf_edgy.diff to support Edgy in knetwortdeconf
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  7 Aug 2006 09:08:39 -0400
 
@@ -315,7 +315,7 @@ tdeadmin (4:3.5.1-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
-  * Drop system-tools-backends.pc from knetworkconf, since it conflicts with
+  * Drop system-tools-backends.pc from knetwortdeconf, since it conflicts with
     gnome-system-tools. (Closes: #353321)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 19 Feb 2006 14:30:28 -0500
@@ -416,9 +416,9 @@ tdeadmin (4:3.5.1-0ubuntu1) dapper; urgency=low
 
 tdeadmin (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add kubuntu_01_knetworkconf_branch_fixes.diff fixes
-    - http://bugzilla.ubuntu.com/9871 knetworkconf doesn't save gateway
-    - http://bugzilla.ubuntu.com/16921 knetworkconf too big for 1024x768
+  * Add kubuntu_01_knetwortdeconf_branch_fixes.diff fixes
+    - http://bugzilla.ubuntu.com/9871 knetwortdeconf doesn't save gateway
+    - http://bugzilla.ubuntu.com/16921 knetwortdeconf too big for 1024x768
     - Ensure changes are applied when clicking OK and don't leave zombie
     processes around
 
@@ -449,7 +449,7 @@ tdeadmin (4:3.5.0-2) alioth; urgency=low
 
   +++ Changes by Josh Metzler:
 
-  * Create the new knetworkconf package.
+  * Create the new knetwortdeconf package.
 
   +++ Changes by Christopher Martin:
 
diff --git a/debian/wheezy/tdeadmin/debian/control b/debian/wheezy/tdeadmin/debian/control
index ec538087d..0042d0d8d 100644
--- a/debian/wheezy/tdeadmin/debian/control
+++ b/debian/wheezy/tdeadmin/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdeadmin-trinity (<< 4:14.0.0)
 Breaks: kdeadmin-trinity (<< 4:14.0.0)
-Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-kfile-plugins-trinity (>= ${Source-Version}), knetworkconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
+Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version}), tdeadmin-tdefile-plugins-trinity (>= ${Source-Version}), knetwortdeconf-trinity (>= ${Source-Version}), kpackage-trinity (>= ${Source-Version}), ksysv-trinity (>= ${Source-Version}), kuser-trinity (>= ${Source-Version})
 Recommends: lilo-config-trinity (>= ${Source-Version})
 Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
 Description: system administration tools from the official Trinity release
@@ -79,11 +79,11 @@ Description: a Trinity tape backup tool
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: tdeadmin-kfile-plugins-trinity
+Package: tdeadmin-tdefile-plugins-trinity
 Section: tde
 Architecture: any
-Replaces: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
-Breaks: kdeadmin-kfile-plugins-trinity (<< 4:14.0.0)
+Replaces: kdeadmin-tdefile-plugins-trinity (<< 4:14.0.0)
+Breaks: kdeadmin-tdefile-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
@@ -91,11 +91,11 @@ Description: Trinity file metainfo plugins for deb and rpm files
  This package is part of Trinity, as a component of the KDE administration module.
  See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
 
-Package: knetworkconf-trinity
+Package: knetwortdeconf-trinity
 Section: tde
 Architecture: any
-Replaces: knetworkconf-trinity (<< 4:14.0.0)
-Breaks: knetworkconf-trinity (<< 4:14.0.0)
+Replaces: knetwortdeconf-trinity (<< 4:14.0.0)
+Breaks: knetwortdeconf-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Trinity network configuration tool
  This is a KDE control center module to configure TCP/IP settings.  It
diff --git a/debian/wheezy/tdeadmin/debian/control.in b/debian/wheezy/tdeadmin/debian/control.in
index 59b842cd2..b56d4e54c 100644
--- a/debian/wheezy/tdeadmin/debian/control.in
+++ b/debian/wheezy/tdeadmin/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdeadmin
 Section: tde
 Architecture: all
-Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-kfile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
+Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetwortdeconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
 Recommends: lilo-config (>= ${Source-Version})
 Suggests: tdeadmin-doc-html (>= ${Source-Version})
 Description: system administration tools from the official KDE release
@@ -71,7 +71,7 @@ Description: a KDE tape backup tool
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: tdeadmin-kfile-plugins
+Package: tdeadmin-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -81,7 +81,7 @@ Description: KDE file metainfo plugins for deb and rpm files
  This package is part of KDE, as a component of the KDE administration module.
  See the 'kde' and 'tdeadmin' packages for more information.
 
-Package: knetworkconf
+Package: knetwortdeconf
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install b/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install
deleted file mode 100644
index ec0333100..000000000
--- a/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.install
+++ /dev/null
@@ -1,56 +0,0 @@
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network-conf
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/debug.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/file.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/general.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/network.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/parse.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/platform.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/process.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/replace.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/report.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/service-list.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/util.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/backends/xml.pl
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/ark.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/debian.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/blackpanther.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/mandriva.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/pld.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/redhat.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/suse.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/turbolinux.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/conectiva.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/fedora.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/openna.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/slackware.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/freebsd.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/gentoo.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/vine.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png
-debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png
-debian/tmp/opt/trinity/share/applications/tde/kcm_knetworkconfmodule.desktop
-debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so
-debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la
diff --git a/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install b/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install
new file mode 100644
index 000000000..dbe573132
--- /dev/null
+++ b/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.install
@@ -0,0 +1,56 @@
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/01.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/02.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/03.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/04.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/05.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/06.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/07.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/about1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/08.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/09.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetwortdeconf/common
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetwortdeconf.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/network_traffic_wlan.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network-conf
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/debug.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/file.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/general.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/network.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/parse.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/platform.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/process.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/replace.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/report.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/service-list.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/util.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/backends/xml.pl
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/ark.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/debian.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/blackpanther.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/mandriva.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/pld.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/redhat.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/suse.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/turbolinux.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/conectiva.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/fedora.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/openna.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/slackware.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/freebsd.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/gentoo.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/vine.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/rpath.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/kubuntu.png
+debian/tmp/opt/trinity/share/apps/knetwortdeconf/pixmaps/yoper.png
+debian/tmp/opt/trinity/share/applications/tde/kcm_knetwortdeconfmodule.desktop
+debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.so
+debian/tmp/opt/trinity/lib/trinity/kcm_knetwortdeconfmodule.la
diff --git a/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.postinst b/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.postinst
index bcb12994d..b32c2fb00 100644
--- a/debian/wheezy/tdeadmin/debian/knetworkconf-trinity.postinst
+++ b/debian/wheezy/tdeadmin/debian/knetwortdeconf-trinity.postinst
@@ -3,9 +3,9 @@
 case "$1" in
 
     configure)
-	dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png
-	dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png
-	dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetwortdeconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetwortdeconf.png
+	dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetwortdeconf.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png
 	dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
diff --git a/debian/wheezy/tdeadmin/debian/lilo-config-trinity.menu b/debian/wheezy/tdeadmin/debian/lilo-config-trinity.menu
index c7234f5b2..a0e9dc661 100644
--- a/debian/wheezy/tdeadmin/debian/lilo-config-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/lilo-config-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/System/Administration"\
 	hints="TDE"\
 	title="lilo-config"\
-	command="/opt/trinity/bin/tdesu kcmshell lilo"
+	command="/opt/trinity/bin/tdesu tdecmshell lilo"
diff --git a/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf
index 134b08805..59e475dd7 100644
--- a/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
+++ b/debian/wheezy/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetwortdeconf
@@ -1,10 +1,10 @@
-Document: tdeadmin-doc-html-knetworkconf
+Document: tdeadmin-doc-html-knetwortdeconf
 Title: KNetworkConf Handbook
 Author: Sean Wheller, Christoph Eckert
 Abstract: KNetworkConf is a graphical manager for network devices and settings.
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html
-Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html
+Index: /usr/share/doc/tde/HTML/en/knetwortdeconf/index.html
+Files: /usr/share/doc/tde/HTML/en/knetwortdeconf/*.html
 
diff --git a/debian/wheezy/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install b/debian/wheezy/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
deleted file mode 100644
index e3b00f7da..000000000
--- a/debian/wheezy/tdeadmin/debian/tdeadmin-kfile-plugins-trinity.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/opt/trinity/lib/trinity/kfile_deb.la
-debian/tmp/opt/trinity/lib/trinity/kfile_deb.so
-debian/tmp/opt/trinity/lib/trinity/kfile_rpm.la
-debian/tmp/opt/trinity/lib/trinity/kfile_rpm.so
-debian/tmp/opt/trinity/share/services/kfile_deb.desktop
-debian/tmp/opt/trinity/share/services/kfile_rpm.desktop
diff --git a/debian/wheezy/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install b/debian/wheezy/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
new file mode 100644
index 000000000..0e6977ee8
--- /dev/null
+++ b/debian/wheezy/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
@@ -0,0 +1,6 @@
+debian/tmp/opt/trinity/lib/trinity/tdefile_deb.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_deb.so
+debian/tmp/opt/trinity/lib/trinity/tdefile_rpm.la
+debian/tmp/opt/trinity/lib/trinity/tdefile_rpm.so
+debian/tmp/opt/trinity/share/services/tdefile_deb.desktop
+debian/tmp/opt/trinity/share/services/tdefile_rpm.desktop