Update Debian and Ubuntu packaging to match recent renaming

6 files changed, 21 insertions, 21 deletions

diff --git a/ubuntu/maverick/tdenetwork/debian/changelog b/ubuntu/maverick/tdenetwork/debian/changelog
index 43b1aadd7..4510420ac 100644
--- a/ubuntu/maverick/tdenetwork/debian/changelog
+++ b/ubuntu/maverick/tdenetwork/debian/changelog
@@ -173,10 +173,10 @@ tdenetwork (4:3.5.7-2) unstable; urgency=low
   * Don't do anything if lisa is already running. (Closes: #407892)
   * Pull patch from upstream to fix issue with format toolbar. (Closes: #392019)
   * Pull patch from upstream to fix webcam issues. (Closes: #414424)
-  * Remove libnss-mdns from kdnssd-depends. (Closes: 412084)
+  * Remove libnss-mdns from tdednssd-depends. (Closes: 412084)
   * Increase maximum count of lines in ksirc (Closes: 291968)
   * Don't build kwifimanager on s390 - they don't have wifi hardware.
-  * Don't build kwifimanager and kdnssd on !linux archs - tt doesn't built there.
+  * Don't build kwifimanager and tdednssd on !linux archs - tt doesn't built there.
   * Patch to fix builds on kfreebsd archs. (Closes: 398909)
   * Make ktalkd depend on update-inetd - we use it in maint scripts.
 
@@ -483,7 +483,7 @@ tdenetwork (4:3.5.3-1ubuntu5) edgy; urgency=low
 tdenetwork (4:3.5.3-1ubuntu4) edgy; urgency=low
 
   * Add debian/kubuntu_zeroconf/_{fish,sftp}._tcp to add FISH and sFTP support
-    to kdnssd (Closes: Malone 33034).
+    to tdednssd (Closes: Malone 33034).
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 20 Jul 2006 12:13:01 +0200
 
@@ -558,7 +558,7 @@ tdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:
 
-  * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd.
+  * Put zeroconf kioslave and other tdednssd stuff in a new package, tdednssd.
 
   +++ Changes by Christopher Martin:
 
@@ -637,13 +637,13 @@ tdenetwork (4:3.5.2-0ubuntu5) dapper; urgency=low
 
   * Move libnss-mdns and avahi-daemon to Recommends since we don't want avahi
     installed by default.
-  * Add sftp, fish and ipp protocols to kdnssd in debian/zeroconf/.
+  * Add sftp, fish and ipp protocols to tdednssd in debian/zeroconf/.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 19:09:40 +0200
 
 tdenetwork (4:3.5.2-0ubuntu4) dapper; urgency=low
 
-  * Add libnss-mdns and avahi-daemon to dependencies for kdnssd package.
+  * Add libnss-mdns and avahi-daemon to dependencies for tdednssd package.
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Thu, 11 May 2006 18:52:54 +0200
 
@@ -707,14 +707,14 @@ tdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low
 
 tdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low
 
-  * Add kdnssd to tdenetwork meta package
-  * Remove libkdnssd dependency from kdnssd (now in tdelibs)
+  * Add tdednssd to tdenetwork meta package
+  * Remove libtdednssd dependency from tdednssd (now in tdelibs)
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Jan 2006 09:51:13 +0000
 
 tdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low
 
-  * Add package kdnssd with zeroconf:/ ioslave
+  * Add package tdednssd with zeroconf:/ ioslave
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jan 2006 02:22:49 +0000
 
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index a1a2dcb2b..a95cc81a7 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdenetwork-trinity (<< 4:14.0.0)
 Breaks: kdenetwork-trinity (<< 4:14.0.0)
-Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), kdnssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
+Depends: dcoprss-trinity (>= ${Source-Version}), tdenetwork-kfile-plugins-trinity (>= ${Source-Version}), kdict-trinity (>= ${Source-Version}), tdednssd-trinity (>= ${Source-Version}), kget-trinity (>= ${Source-Version}), knewsticker-trinity (>= ${Source-Version}), kopete-trinity (>= ${Source-Version}), kpf-trinity (>= ${Source-Version}), kppp-trinity (>= ${Source-Version}), krdc-trinity (>= ${Source-Version}), krfb-trinity (>= ${Source-Version}), ksirc-trinity (>= ${Source-Version}), kwifimanager-trinity (>= ${Source-Version}), librss1-trinity (>= ${Source-Version})
 Recommends: tdenetwork-filesharing-trinity (>= ${Source-Version}), ktalkd-trinity (>= ${Source-Version}), lisa-trinity (>= ${Source-Version})
 Suggests: tdenetwork-trinity-doc-html (>= ${Source-Version})
 Description: network-related apps from the official Trinity release
@@ -331,11 +331,11 @@ Description: LAN information server for Trinity
  This package is part of Trinity, as a component of the KDE network module.
  See the 'kde-trinity' and 'tdenetwork-trinity' packages for more information.
 
-Package: kdnssd-trinity
+Package: tdednssd-trinity
 Section: net
 Architecture: any
-Replaces: kdnssd-trinity (<< 4:14.0.0)
-Breaks: kdnssd-trinity (<< 4:14.0.0)
+Replaces: tdednssd-trinity (<< 4:14.0.0)
+Breaks: tdednssd-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: avahi-daemon
 Suggests: avahi-autoipd | zeroconf
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 1c7fc62f9..7c7dfdc41 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/tdenetwork/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdenetwork
 Section: tde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), tdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), tdednssd (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], librss1 (>= ${Source-Version})
 Recommends: tdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: tdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -299,7 +299,7 @@ Description: LAN information server for KDE
  This package is part of KDE, as a component of the KDE network module.
  See the 'kde' and 'tdenetwork' packages for more information.
 
-Package: kdnssd
+Package: tdednssd
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
index 9a1ac79f5..d2a0707c9 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kget
-debian/tmp/opt/trinity/lib/trinity/khtml_kget.la
-debian/tmp/opt/trinity/lib/trinity/khtml_kget.so
+debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.la
+debian/tmp/opt/trinity/lib/trinity/tdehtml_kget.so
 debian/tmp/opt/trinity/share/applications/tde/kget.desktop
 debian/tmp/opt/trinity/share/apps/kget/eventsrc
 debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
@@ -52,8 +52,8 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try4.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try5.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try6.png
 debian/tmp/opt/trinity/share/apps/kget/pics/try7.png
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop
-debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.desktop
+debian/tmp/opt/trinity/share/apps/tdehtml/kpartplugins/kget_plug_in.rc
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png
@@ -66,7 +66,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/tdehtml_kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 2579d07e3..0ee562691 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -7,7 +7,7 @@ ifeq ($(DEB_HOST_ARCH),s390)
 DONT_BUILD+= kwifimanager
 endif
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-DONT_BUILD+= kwifimanager kdnssd
+DONT_BUILD+= kwifimanager tdednssd
 endif
 export DH_OPTIONS
 
diff --git a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
index 8d6a52c6b..8d6a52c6b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdnssd-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install