Update Debian and Ubuntu packaging to match recent renaming

10 files changed, 25 insertions, 25 deletions

diff --git a/ubuntu/maverick_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog
index e089652fe..8f5ffa359 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/changelog
+++ b/ubuntu/maverick_automake/kdesdk/debian/changelog
@@ -222,9 +222,9 @@ kdesdk (4:3.5.5-2) unstable; urgency=low
   +++ Changes by Sune Vuorela:
 
   * Add support for automake 1.10 to kapptemplate. (Closes: #396985)
-  * Add Suggests: kdelibs4-doc to kunittest. kdelibs4-doc contains kunittest
+  * Add Suggests: kdelibs4-doc to tdeunittest. kdelibs4-doc contains tdeunittest
     documentation. (Closes: #386040)
-  * Don't install /usr/bin/kunittest and /usr/bin/kunittest_debughelper. These
+  * Don't install /usr/bin/tdeunittest and /usr/bin/tdeunittest_debughelper. These
     are not useful without the dcopperl bindings which are not built in the
     Debian kdebindings packages. (Closes: #386039)
 
@@ -427,7 +427,7 @@ kdesdk (4:3.5.0-1) alioth; urgency=low
 
   * Add a kdesdk-dbg package for helping to trace problems.
 
-  * New packages: kunittest, and kdesdk-kio-plugins, which splits
+  * New packages: tdeunittest, and kdesdk-kio-plugins, which splits
     out the svn ioslave from kdesdk-misc.
 
   * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's
diff --git a/ubuntu/maverick_automake/kdesdk/debian/control b/ubuntu/maverick_automake/kdesdk/debian/control
index 995f4136f..3efde280c 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/control
+++ b/ubuntu/maverick_automake/kdesdk/debian/control
@@ -14,7 +14,7 @@ Standards-Version: 3.8.3
 Package: kdesdk-kde3
 Architecture: all
 Section: kde
-Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
+Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), tdeunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
 Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html
 Description: software development kit from the official KDE3 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -373,17 +373,17 @@ Description: subversion ioslave for KDE3
  This package is part of KDE3, and a component of the KDE SDK module.
  See the 'kde-kde3' and 'kdesdk-kde3' packages for more information.
 
-Package: kunittest-kde3
+Package: tdeunittest-kde3
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: kunittest
+Conflicts: tdeunittest
 Suggests: kdelibs4-kde3-doc
 Description: unit testing library for KDE3
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
- to create dynamically loadable modules and use the kunittestmodrunner or
- kunittestguimodrunner programs to run the tests. The other is to use the
+ to create dynamically loadable modules and use the tdeunittestmodrunner or
+ tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
  This package is part of KDE3, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick_automake/kdesdk/debian/control.in b/ubuntu/maverick_automake/kdesdk/debian/control.in
index fb2d6cec3..3b80525fe 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/control.in
+++ b/ubuntu/maverick_automake/kdesdk/debian/control.in
@@ -13,7 +13,7 @@ Standards-Version: 3.7.2
 Package: kdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), tdeunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
 Suggests: tdecachegrind-converters, kbabel-dev, kdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -356,7 +356,7 @@ Description: subversion ioslave for KDE
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'kdesdk' packages for more information.
 
-Package: kunittest
+Package: tdeunittest
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
@@ -364,8 +364,8 @@ Suggests: kdelibs4-doc
 Description: unit testing library for KDE
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
- to create dynamically loadable modules and use the kunittestmodrunner or
- kunittestguimodrunner programs to run the tests. The other is to use the
+ to create dynamically loadable modules and use the tdeunittestmodrunner or
+ tdeunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
  This package is part of KDE, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install
index ab97c654a..74efdd0a5 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kbugbuster-kde3.install
@@ -18,5 +18,5 @@ debian/tmp/opt/kde3/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/opt/kde3/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kbugbuster.png
-debian/tmp/opt/kde3/share/services/kresources/kcal/bugzilla.desktop
+debian/tmp/opt/kde3/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /opt/kde3/share/pixmaps
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs
deleted file mode 100644
index 029481923..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.docs
+++ /dev/null
@@ -1 +0,0 @@
-kunittest/example
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install
deleted file mode 100644
index 0be1336e4..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install
+++ /dev/null
@@ -1,7 +0,0 @@
-debian/tmp/opt/kde3/bin/kunittestmod
-debian/tmp/opt/kde3/bin/kunittestguimodrunner
-debian/tmp/opt/kde3/lib/libkunittestgui.la
-debian/tmp/opt/kde3/lib/libkunittestgui.so
-debian/tmp/opt/kde3/lib/libkunittestgui.so.0
-debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h
diff --git a/ubuntu/maverick_automake/kdesdk/debian/not-installed.list b/ubuntu/maverick_automake/kdesdk/debian/not-installed.list
index f801ede2f..b35fe772b 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/not-installed.list
+++ b/ubuntu/maverick_automake/kdesdk/debian/not-installed.list
@@ -4,8 +4,8 @@ This is deliberate.
 /usr/share/man/man1/cvscheck.1
  - This manpage is junk, so we don't ship it, and include our own instead.
 
-/usr/bin/kunittest
-/usr/bin/kunittest_debughelper
+/usr/bin/tdeunittest
+/usr/bin/tdeunittest_debughelper
  - These are not useful without the dcopperl bindings which are not built
    in the Debian kdebindings packages.
 
diff --git a/ubuntu/maverick_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules
index 1a91a4065..64c2cd3e0 100755
--- a/ubuntu/maverick_automake/kdesdk/debian/rules
+++ b/ubuntu/maverick_automake/kdesdk/debian/rules
@@ -16,12 +16,12 @@ DEB_DH_STRIP_ARGS := --dbg-package=kdesdk-kde3-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
 
-PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 kunittest-kde3 libcvsservice0-kde3 umbrello-kde3
+PACKAGES_WITH_LIBS := kbabel-kde3 kompare-kde3 kspy-kde3 tdeunittest-kde3 libcvsservice0-kde3 umbrello-kde3
 
 DEB_DH_MAKESHLIBS_ARGS_kbabel-kde3			:= -V'kbabel-kde3 (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_kompare-kde3			:= -V'kompare-kde3 (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_kspy-kde3			:= -V'kspy-kde3 (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kunittest-kde3			:= -V'kunittest-kde3 (>= 4:3.5.8-1)'
+DEB_DH_MAKESHLIBS_ARGS_tdeunittest-kde3			:= -V'tdeunittest-kde3 (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-kde3		:= -V'libcvsservice0-kde3 (>= 4:3.5.8-1)'
 DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3			:= -V'umbrello-kde3 (>= 4:3.5.8-1)'
 
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs
new file mode 100644
index 000000000..dfb20154e
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.docs
@@ -0,0 +1 @@
+tdeunittest/example
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install
new file mode 100644
index 000000000..700fbe390
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdeunittest-kde3.install
@@ -0,0 +1,7 @@
+debian/tmp/opt/kde3/bin/tdeunittestmod
+debian/tmp/opt/kde3/bin/tdeunittestguimodrunner
+debian/tmp/opt/kde3/lib/libtdeunittestgui.la
+debian/tmp/opt/kde3/lib/libtdeunittestgui.so
+debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0
+debian/tmp/opt/kde3/lib/libtdeunittestgui.so.0.0.0
+debian/tmp/opt/kde3/include/tde/tdeunittest/runnergui.h