diff options
Diffstat (limited to 'ubuntu/maverick/applications/amarok')
5 files changed, 18 insertions, 18 deletions
diff --git a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES index ca324be99..db5399106 100644 --- a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -9,6 +9,6 @@ remove amarok-common.lintian, amarok.lintian make watch file actually work #### due to removal of KDE 3 packages #### -remove kdemultimedia-dev, kdebase-dev from Build-Depends -remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends +remove tdemultimedia-dev, tdebase-dev from Build-Depends +remove amarok-konqsidebar, tdemultimedia-kio-plugins from Recommends remove complete amarok-konqsidebar package diff --git a/ubuntu/maverick/applications/amarok/debian/README.Debian b/ubuntu/maverick/applications/amarok/debian/README.Debian index 7dc17fb17..d696b9696 100644 --- a/ubuntu/maverick/applications/amarok/debian/README.Debian +++ b/ubuntu/maverick/applications/amarok/debian/README.Debian @@ -10,7 +10,7 @@ Amarok packages for Debian script. - if you want amarok to be able to play CDs, you need to install the - kdemultimedia-kio-plugins package. + tdemultimedia-kio-plugins package. - the scripts available in the 'Scripts' menu need that you install some other packages for them to work. Those packages are listed in diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog index 43671ac52..e72612a70 100644 --- a/ubuntu/maverick/applications/amarok/debian/changelog +++ b/ubuntu/maverick/applications/amarok/debian/changelog @@ -225,7 +225,7 @@ amarok (1.4.8-1) unstable; urgency=low * Resync patches: - proxy_lyrics.diff - removed, merged upstream. - fix_gcc4.3_ftbfs.diff - removed, resolved upstream. - * Drop kdemultimedia-dev from Build-Depends. It's no longer needed. + * Drop tdemultimedia-dev from Build-Depends. It's no longer needed. * debian/rules: use /usr/share/automake-1.10 instead of *-1.9 because 'automake' package provides version 1.10. @@ -233,7 +233,7 @@ amarok (1.4.8-1) unstable; urgency=low amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low - * Added kdebase-kio-plugins as a recommened package + * Added tdebase-kio-plugins as a recommened package -- Jonathan Aquilina <eagles051387@gmail.com> Tue, 15 Apr 2008 14:24:23 +0200 @@ -266,7 +266,7 @@ amarok (2:1.4.9-0ubuntu1) hardy; urgency=low amarok (2:1.4.8-0ubuntu5) hardy; urgency=low * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's - media device detection to properly work with kdebase's + media device detection to properly work with tdebase's LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384) -- Harald Sitter <apachelogger@ubuntu.com> Tue, 18 Mar 2008 01:10:01 +0100 @@ -563,7 +563,7 @@ amarok (2:1.4.5-0ubuntu1) feisty; urgency=low - sparc-asm.patch [ Sarah Hobbs ] - * Added dependancy kdebase-kio-plugins. Closes malone #66764 + * Added dependancy tdebase-kio-plugins. Closes malone #66764 * Compiling without stack smashing protection. Closes malone #81768 -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sun, 4 Feb 2007 00:46:12 -0600 @@ -659,7 +659,7 @@ amarok (2:1.4.3-0ubuntu9) edgy; urgency=low amarok (2:1.4.3-0ubuntu8) edgy; urgency=low * The DAAP client would crash Amarok under certain conditions when - kdelibs was compiled with asserts on. Thanks to Ian Monroe + tdelibs was compiled with asserts on. Thanks to Ian Monroe * Closes KDE: #132851 -- Brandon Holtsclaw <imbrandon@kubuntu.org> Wed, 20 Sep 2006 21:10:11 -0500 @@ -920,7 +920,7 @@ amarok (1.3.8-1) unstable; urgency=low * Switch patch management to quilt, and make use of patchsys-quilt.mk. * Drop build-depends version constraints that are satisfied with stable. - Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were + Drop the ones for tdebase-dev and tdemultimedia-dev as well, which were transient and all arches have the minimum required versions in sid now. -- Adeodato Simó <dato@net.com.org.es> Wed, 18 Jan 2006 01:43:40 +0100 @@ -929,8 +929,8 @@ amarok (1.3.7-1) unstable; urgency=low * New upstream bugfix release. - * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959) - Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev. + * Built against tdelibs4c2a, so installable in sid again. (Closes: #341959) + Temporarily bump build-deps on tdebase-dev and tdemultimedia-dev. * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in testing and unstable, and I'll be using a backport for sarge packages. @@ -1191,7 +1191,7 @@ amarok (1.3.0-1) unstable; urgency=low + automake1.6 to automake1.9. + libmysqlclient12-dev to libmysqlclient14-dev. - + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev + + temporarily bump version constraint in tdemultimedia-dev and tdebase-dev in order to allow an early upload in the middle of the KDE transition. * Adjustments to the build-system: @@ -1337,7 +1337,7 @@ amarok (1.2.0-1) unstable; urgency=low - add files for the konqueror sidebar. + debian/control: - - added kdebase-dev as Build-Dependency. + - added tdebase-dev as Build-Dependency. + debian/rules: - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that @@ -1397,7 +1397,7 @@ amarok (1.1.1-2) unstable; urgency=high * New package relationships: - + amarok now recommends kdemultimedia-kio-plugins, which is needed to play + + amarok now recommends tdemultimedia-kio-plugins, which is needed to play audio CDs. + amarok now suggests konqueror, since it's called in the MusicBrainz diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index 073eae0ce..0b36962a8 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, - kdelibs4-trinity-dev, + tdelibs4-trinity-dev, libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, libtunepimp-dev, libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev, @@ -102,7 +102,7 @@ Architecture: any Replaces: amarok-kde3-dbg (<< 4:3.5.13) Breaks: amarok-kde3-dbg (<< 4:3.5.13) Depends: amarok-trinity (= ${binary:Version}) -Recommends: kdelibs-trinity-dbg +Recommends: tdelibs-trinity-dbg Description: debugging symbols for Amarok [Trinity] This package provides debugging symbols for all binary packages built from amarok source package. It's highly recommended to have this package installed diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in index d57046d4c..52ef14266 100644 --- a/ubuntu/maverick/applications/amarok/debian/control.in +++ b/ubuntu/maverick/applications/amarok/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, libtool, - kdelibs4-trinity-dev, + tdelibs4-trinity-dev, libxine-dev, libdbus-qt-1-dev, libtag1-dev, libsqlite3-dev, libtunepimp-dev, libmysqlclient15-dev, libpq-dev, @@ -89,7 +89,7 @@ Package: amarok-trinity-dbg Priority: extra Architecture: any Depends: amarok-trinity (= ${binary:Version}) -Recommends: kdelibs-trinity-dbg +Recommends: tdelibs-trinity-dbg Description: debugging symbols for Amarok [Trinity] This package provides debugging symbols for all binary packages built from amarok source package. It's highly recommended to have this package installed |