From 469a2fea7abec99022999bfd31e6d81c9364e325 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 15:25:21 -0600 Subject: Update Debian and Ubuntu packaging to match recent renaming --- debian/squeeze/tdesdk/debian/changelog | 6 +++--- debian/squeeze/tdesdk/debian/control | 14 +++++++------- debian/squeeze/tdesdk/debian/control.in | 8 ++++---- debian/squeeze/tdesdk/debian/kbugbuster-trinity.install | 2 +- debian/squeeze/tdesdk/debian/kunittest-trinity.docs | 1 - debian/squeeze/tdesdk/debian/kunittest-trinity.install | 7 ------- debian/squeeze/tdesdk/debian/not-installed.list | 4 ++-- debian/squeeze/tdesdk/debian/rules | 2 +- debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs | 1 + debian/squeeze/tdesdk/debian/tdeunittest-trinity.install | 7 +++++++ 10 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 debian/squeeze/tdesdk/debian/kunittest-trinity.docs delete mode 100644 debian/squeeze/tdesdk/debian/kunittest-trinity.install create mode 100644 debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs create mode 100644 debian/squeeze/tdesdk/debian/tdeunittest-trinity.install (limited to 'debian/squeeze/tdesdk/debian') diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog index 1bbe6e2e4..2480854bc 100644 --- a/debian/squeeze/tdesdk/debian/changelog +++ b/debian/squeeze/tdesdk/debian/changelog @@ -222,9 +222,9 @@ tdesdk (4:3.5.5-2) unstable; urgency=low +++ Changes by Sune Vuorela: * Add support for automake 1.10 to kapptemplate. (Closes: #396985) - * Add Suggests: tdelibs4-doc to kunittest. tdelibs4-doc contains kunittest + * Add Suggests: tdelibs4-doc to tdeunittest. tdelibs4-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 tdebindings packages. (Closes: #386039) @@ -427,7 +427,7 @@ tdesdk (4:3.5.0-1) alioth; urgency=low * Add a tdesdk-dbg package for helping to trace problems. - * New packages: kunittest, and tdesdk-kio-plugins, which splits + * New packages: tdeunittest, and tdesdk-kio-plugins, which splits out the svn ioslave from tdesdk-misc. * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control index 5305f7b08..935dbf0bf 100644 --- a/debian/squeeze/tdesdk/debian/control +++ b/debian/squeeze/tdesdk/debian/control @@ -16,7 +16,7 @@ Architecture: all Section: tde Replaces: kdesdk-trinity (<< 4:14.0.0) Breaks: kdesdk-trinity (<< 4:14.0.0) -Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) +Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), tdeunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version}) Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html Description: software development kit from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -407,19 +407,19 @@ Description: subversion ioslave for Trinity This package is part of Trinity, and a component of the KDE SDK module. See the 'kde-trinity' and 'tdesdk-trinity' packages for more information. -Package: kunittest-trinity +Package: tdeunittest-trinity Architecture: any Section: devel -Replaces: kunittest-trinity (<< 4:14.0.0) -Breaks: kunittest-trinity (<< 4:14.0.0) +Replaces: tdeunittest-trinity (<< 4:14.0.0) +Breaks: tdeunittest-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Conflicts: kunittest +Conflicts: tdeunittest Suggests: tdelibs4-trinity-doc Description: unit testing library for Trinity 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 Trinity, and a component of the KDE SDK module. diff --git a/debian/squeeze/tdesdk/debian/control.in b/debian/squeeze/tdesdk/debian/control.in index 6aaa2bce3..d791b8ee8 100644 --- a/debian/squeeze/tdesdk/debian/control.in +++ b/debian/squeeze/tdesdk/debian/control.in @@ -13,7 +13,7 @@ Standards-Version: 3.7.2 Package: tdesdk Architecture: all Section: tde -Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-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}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-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, tdesdk-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 'tdesdk' packages for more information. -Package: kunittest +Package: tdeunittest Architecture: any Section: devel Depends: ${shlibs:Depends} @@ -364,8 +364,8 @@ Suggests: tdelibs4-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/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install index ca24935e3..50b9c1fe5 100644 --- a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install +++ b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.install @@ -18,5 +18,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png -debian/tmp/opt/trinity/share/services/kresources/kcal/bugzilla.desktop +debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.docs b/debian/squeeze/tdesdk/debian/kunittest-trinity.docs deleted file mode 100644 index 029481923..000000000 --- a/debian/squeeze/tdesdk/debian/kunittest-trinity.docs +++ /dev/null @@ -1 +0,0 @@ -kunittest/example diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.install b/debian/squeeze/tdesdk/debian/kunittest-trinity.install deleted file mode 100644 index bf4cf0b5a..000000000 --- a/debian/squeeze/tdesdk/debian/kunittest-trinity.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/tmp/opt/trinity/bin/kunittestmod -debian/tmp/opt/trinity/bin/kunittestguimodrunner -debian/tmp/opt/trinity/lib/libkunittestgui.la -debian/tmp/opt/trinity/lib/libkunittestgui.so -debian/tmp/opt/trinity/lib/libkunittestgui.so.0 -debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/squeeze/tdesdk/debian/not-installed.list b/debian/squeeze/tdesdk/debian/not-installed.list index 77ec5e17d..179532c87 100644 --- a/debian/squeeze/tdesdk/debian/not-installed.list +++ b/debian/squeeze/tdesdk/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 tdebindings packages. diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules index 36d49b7c7..2e37f4326 100755 --- a/debian/squeeze/tdesdk/debian/rules +++ b/debian/squeeze/tdesdk/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" -PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity +PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity tdeunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) diff --git a/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs new file mode 100644 index 000000000..dfb20154e --- /dev/null +++ b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.docs @@ -0,0 +1 @@ +tdeunittest/example diff --git a/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install new file mode 100644 index 000000000..efefebac3 --- /dev/null +++ b/debian/squeeze/tdesdk/debian/tdeunittest-trinity.install @@ -0,0 +1,7 @@ +debian/tmp/opt/trinity/bin/tdeunittestmod +debian/tmp/opt/trinity/bin/tdeunittestguimodrunner +debian/tmp/opt/trinity/lib/libtdeunittestgui.la +debian/tmp/opt/trinity/lib/libtdeunittestgui.so +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0 +debian/tmp/opt/trinity/lib/libtdeunittestgui.so.0.0.0 +debian/tmp/opt/trinity/include/tdeunittest/runnergui.h -- cgit v1.2.1