rev 9474 - in kde-extras/amarok/trunk/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Tue Feb 26 20:29:38 UTC 2008
Author: modax-guest
Date: 2008-02-26 20:29:37 +0000 (Tue, 26 Feb 2008)
New Revision: 9474
Added:
kde-extras/amarok/trunk/debian/amarok-common.install
kde-extras/amarok/trunk/debian/amarok-engine-xine.install
kde-extras/amarok/trunk/debian/amarok-engine-yauap.install
kde-extras/amarok/trunk/debian/amarok-konqsidebar.install
kde-extras/amarok/trunk/debian/patches/12_devicemanager_dcopcall_no_timeout.diff
Removed:
kde-extras/amarok/trunk/debian/TODO
kde-extras/amarok/trunk/debian/amarok-xine.install
kde-extras/amarok/trunk/debian/amarok-yauap.install
Modified:
kde-extras/amarok/trunk/debian/amarok.install
kde-extras/amarok/trunk/debian/changelog
kde-extras/amarok/trunk/debian/control
kde-extras/amarok/trunk/debian/patches/series
kde-extras/amarok/trunk/debian/rules
Log:
More changes for amarok 1.4.8-2
Deleted: kde-extras/amarok/trunk/debian/TODO
Added: kde-extras/amarok/trunk/debian/amarok-common.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-common.install (rev 0)
+++ kde-extras/amarok/trunk/debian/amarok-common.install 2008-02-26 20:29:37 UTC (rev 9474)
@@ -0,0 +1,22 @@
+debian/tmp/usr/share/apps/amarok/*
+debian/tmp/usr/share/apps/profiles/*
+debian/tmp/usr/share/doc/*
+debian/tmp/usr/share/icons/*
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/share/config.kcfg/amarok.kcfg
+debian/tmp/usr/share/services/amarok_void-engine_plugin.desktop
+debian/tmp/usr/share/services/amarok_generic-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_ifp-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_ipod-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_njb-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_smb-device.desktop
+debian/tmp/usr/share/services/amarok_massstorage-device.desktop
+debian/tmp/usr/share/services/amarok_nfs-device.desktop
+debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_riokarma-mediadevice.desktop
+debian/tmp/usr/share/services/amarok_mtp-mediadevice.desktop
+debian/tmp/usr/lib/ruby_lib/* /usr/lib/ruby_lib/
+debian/tmp/usr/bin/amarok_proxy.rb
+debian/tmp/usr/bin/amarok_daapserver.rb
+debian/tmp/etc/*
+debian/icons/* /usr/share/pixmaps
Added: kde-extras/amarok/trunk/debian/amarok-engine-xine.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-engine-xine.install (rev 0)
+++ kde-extras/amarok/trunk/debian/amarok-engine-xine.install 2008-02-26 20:29:37 UTC (rev 9474)
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/services/amarok_xine-engine.desktop
+debian/tmp/usr/share/config.kcfg/xinecfg.kcfg
+debian/tmp/usr/lib/kde3/libamarok_xine-engine.so
+debian/tmp/usr/lib/kde3/libamarok_xine-engine.la
Copied: kde-extras/amarok/trunk/debian/amarok-engine-yauap.install (from rev 9471, kde-extras/amarok/trunk/debian/amarok-yauap.install)
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-engine-yauap.install (rev 0)
+++ kde-extras/amarok/trunk/debian/amarok-engine-yauap.install 2008-02-26 20:29:37 UTC (rev 9474)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/services/amarok_yauap-engine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.la
+debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.so
Added: kde-extras/amarok/trunk/debian/amarok-konqsidebar.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-konqsidebar.install (rev 0)
+++ kde-extras/amarok/trunk/debian/amarok-konqsidebar.install 2008-02-26 20:29:37 UTC (rev 9474)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la
+debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
+debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop
+debian/tmp/usr/share/apps/konqsidebartng/entries/amarok.desktop
+debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/amarok.desktop
Deleted: kde-extras/amarok/trunk/debian/amarok-xine.install
Deleted: kde-extras/amarok/trunk/debian/amarok-yauap.install
Modified: kde-extras/amarok/trunk/debian/amarok.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok.install 2008-02-26 18:29:21 UTC (rev 9473)
+++ kde-extras/amarok/trunk/debian/amarok.install 2008-02-26 20:29:37 UTC (rev 9474)
@@ -1,10 +1,3 @@
-debian/tmp/usr/share/apps/amarok/*
-debian/tmp/usr/share/apps/profiles/*
-debian/tmp/usr/share/doc/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/locale/*
-
-debian/tmp/usr/share/config.kcfg/amarok.kcfg
debian/tmp/usr/share/applications/kde/amarok.desktop
debian/tmp/usr/share/services/amarokitpc.protocol
debian/tmp/usr/share/services/amaroklastfm.protocol
@@ -14,67 +7,30 @@
debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_append.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-
debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la
debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so
-debian/tmp/usr/share/services/amarok_void-engine_plugin.desktop
-
-debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la
-debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
-debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop
-debian/tmp/usr/share/apps/konqsidebartng/entries/amarok.desktop
-debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/amarok.desktop
-
debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.so
-debian/tmp/usr/share/services/amarok_generic-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.so
-debian/tmp/usr/share/services/amarok_ifp-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.so
-debian/tmp/usr/share/services/amarok_ipod-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.so
-debian/tmp/usr/share/services/amarok_njb-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_smb-device.la
debian/tmp/usr/lib/kde3/libamarok_smb-device.so
-debian/tmp/usr/share/services/amarok_smb-device.desktop
-
debian/tmp/usr/lib/kde3/libamarok_massstorage-device.la
debian/tmp/usr/lib/kde3/libamarok_massstorage-device.so
-debian/tmp/usr/share/services/amarok_massstorage-device.desktop
-
debian/tmp/usr/lib/kde3/libamarok_nfs-device.la
debian/tmp/usr/lib/kde3/libamarok_nfs-device.so
-debian/tmp/usr/share/services/amarok_nfs-device.desktop
-
debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.so
-debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.so
-debian/tmp/usr/share/services/amarok_riokarma-mediadevice.desktop
-
debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.la
debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.so
-debian/tmp/usr/share/services/amarok_mtp-mediadevice.desktop
-
-debian/tmp/usr/lib/ruby_lib/* /usr/lib/ruby_lib/
debian/tmp/usr/lib/libamarok.*
-
debian/tmp/usr/bin/amarok
debian/tmp/usr/bin/amarokapp
-debian/tmp/usr/bin/amarok_proxy.rb
debian/tmp/usr/bin/amarok_libvisual
-debian/tmp/usr/bin/amarok_daapserver.rb
debian/tmp/usr/bin/amarokcollectionscanner
-
-debian/tmp/etc/*
-
-debian/icons/* /usr/share/pixmaps
Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog 2008-02-26 18:29:21 UTC (rev 9473)
+++ kde-extras/amarok/trunk/debian/changelog 2008-02-26 20:29:37 UTC (rev 9474)
@@ -1,48 +1,72 @@
-amarok (1.4.8-2~pre2) unstable; urgency=low
+amarok (1.4.8-2~pre6) unstable; urgency=low
* Remove amarok-gstreamer.install because there is no gstreamer engine
anymore.
+ * Remove overrides/amarok-arts. arts engine is no longer available.
* Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge
missing functionality (cvs-make/automake) into debian/rules.
* Auto-guess automake /usr/share directory.
+ * Rework interdependences among amarok and its engines' packages:
+ - Drop amarok-engine virtual package. Amarok and its engines ABI are not
+ even compatible between Amarok point releases so virtual package, which,
+ unfortunately, is versionless by definition, is not practical here.
+ - Rename engine packages to amarok-engine-$engine. Make them conflict
+ and replace previous amarok-$engine packages. Also make amarok conflict
+ with amarok-engine virtual package. All these changes will ensure that
+ partial upgrades from etch are not allowed (Closes: #432219).
+ - Make amarok depend on any of its engines of the same binary version
+ via alternate dependences. Default engine is amarok-engine-xine. Edit
+ amarok-engine-xine description accordingly.
+ - Make all amarok engines recommend amarok strictly of the same binary
+ version. Recommends instead of Depends here breaks circular dependency
+ (Closes: #368485).
+ - Downgrade amarok-engines to amarok Suggests.
+ - Convert amarok-engines package to arch:all because it's a metapackage.
+ Edit amarok-engines description because it's no longer going to be
+ installed by default.
+ - Add amarok-yauap to amarok-engines Suggests.
* New binary packages:
- - amarok-dbg - debugging symbols (Closes: #368840)
- - amarok-yauap - Yauap Commandline Audio Player engine:
+ - amarok-common - arch:all package for architecture independent files
+ splitted from amarok. It recommends amarok (>= ${source:Version}) to
+ avoid circular dependency as in case of stricter "Depends" relationship.
+ - amarok-konqsidebar - split konqsidebar into its own binary package. The
+ reason for this is that it's incompatible with konqueror (>= 4:4.0.0)
+ and needs to _conflict_ with it (due to *.desktop files). Add
+ amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar
+ Depends.
+ - amarok-dbg - package with debugging symbols (Closes: #368840).
+ - amarok-engine-yauap - Yauap Commandline Audio Player engine
+ (Closes: #445371):
* Add libdbus-qt-1-dev to Build-Depends
* Pass --with-yauap to configure
* Add amarok-yauap.install
- * Rework interdependences among amarok binary packages:
- - Drop amarok-engine virtual package. Amarok and its engines ABI are not
- even compatible between Amarok point releases so virtual package is
- not practical here.
- - Make amarok depend on any of its engines (via alternate dependences)
- of the same binary version. Default engine is amarok-xine. Edit
- amarok-xine description accordingly.
- - Make all amarok engines recommend amarok strictly of the same binary
- version. Here Recommends instead of Depends breaks circular dependency
- (Closes: #368485).
- - Make all amarok engines conflict with all amarok versions non-equal to
- their binary version. This should also ensure that partial upgrades are
- never allowed (Closes: #432219).
- - Downgrade amarok-engines to amarok Suggests.
- - Convert amarok-engines package to arch:all as it's a metapackage. Edit
- amarok-engines description because it's no longer going to be installed
- by default.
- * Add "Homepage" field in debian/control, remove homepage reference from
- amarok description.
+ * This engine was added for the sake of completeness. Yauap has not
+ been packaged for Debian yet, but some users might have it installed
+ locally and might find this engine useful.
+ * Add "Homepage" field to debian/control source section, remove homepage
+ reference from amarok binary package description.
* Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just
complicate packaging unnecessarily and make lintian unhappy.
* Ship only README from upstream source in /usr/share/doc/amarok.
- * debian/README.Debian: remove a note about installing ruby, because it's a
- dependency and gets installed anyway.
+ * debian/README.Debian: remove a note about installing ruby, because it's
+ a dependency and gets installed anyway.
* Prepend sequence number to the filenames of debian/patches. Edit
debian/patches/series accordingly.
* New patches:
- 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending
- 'rename' request for the playlist item that has just been deleted
- (Closes: #403340).
+ 'rename' request for the playlist item that is about to be deleted.
+ The patch solves a popular crash. (Closes: #403340).
+ - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop
+ calls. It's very unsafe because it might break further dcop calls such
+ as the one in the debian bug #432752 (Closes: #432752).
+ * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package
+ description accordingly.
+ * Add DM-Upload-Allowed: yes to debian/control source section.
+ * s/XS-Vcs/Vcs/ in debian/control.
+ * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with
+ recent dpkg-shlibdeps.
- -- Modestas Vainius <modestas at vainius.eu> Wed, 26 Dec 2007 00:26:44 +0200
+ -- Modestas Vainius <modestas at vainius.eu> Tue, 26 Feb 2008 22:21:53 +0200
amarok (1.4.8-1) unstable; urgency=low
Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control 2008-02-26 18:29:21 UTC (rev 9473)
+++ kde-extras/amarok/trunk/debian/control 2008-02-26 20:29:37 UTC (rev 9474)
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: Modestas Vainius <modestas at vainius.eu>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Adeodato Simó <dato at net.com.org.es>
+DM-Upload-Allowed: yes
Build-Depends: cdbs, debhelper, quilt, bzip2, automake, libtool,
kdelibs4-dev, kdebase-dev,
libxine-dev, libdbus-qt-1-dev,
@@ -12,16 +13,17 @@
libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libkarma-dev, libmtp-dev,
ruby, ruby1.8-dev
Standards-Version: 3.7.3
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/amarok/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/amarok/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/amarok/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/amarok/trunk/
Homepage: http://amarok.kde.org
Package: amarok
Architecture: any
-Depends: amarok-xine (= ${binary:Version}) | amarok-yauap (= ${binary:Version}), ruby, unzip, ${shlibs:Depends}
-Recommends: kdemultimedia-kio-plugins
-Suggests: amarok-engines, libvisual-0.4-plugins, konqueror | www-browser, python, python-qt3, libqt0-ruby1.8
-Description: versatile and easy to use audio player for KDE
+Depends: amarok-common (>= ${source:Version}), amarok-engine-xine (= ${binary:Version}) | amarok-engine-yauap (= ${binary:Version}), ruby, unzip, ${shlibs:Depends}
+Recommends: amarok-konqsidebar, kdemultimedia-kio-plugins
+Conflicts: amarok-engine
+Suggests: amarok-engines, moodbar, libvisual-0.4-plugins, konqueror | www-browser, python, python-qt3, libqt0-ruby1.8
+Description: versatile and easy to use audio player for KDE3
Amarok tries to be a little different, providing a simple drag and drop
interface that really makes playlist handling easy.
.
@@ -38,41 +40,67 @@
- easy bindable global shortcuts, rich DCOP interface
- On-Screen Display (OSD), on track change or at keypress
- iPod and iRiver support
- - Last.fm stream playing support (if ruby is installed)
+ - Last.fm stream playing support
+ - Track "mood" display (requires moodbar package installed)
.
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: amarok-common
+Architecture: all
+Depends: ruby
+Recommends: amarok (>= ${source:Version})
+Replaces: amarok (<= 1.4.8-1)
+Description: architecture independent files for Amarok
+ This package contains architecture independent files needed for Amarok to run
+ properly. Therefore, unless you have 'amarok' package installed, you will
+ hardly find this package useful.
+
+Package: amarok-konqsidebar
+Architecture: any
+Depends: amarok (= ${binary:Version}), konqueror (>= 4:3.0.0), konqueror (<< 4:3.90.0), ${shlibs:Depends}
+Replaces: amarok (<= 1.4.8-1)
+Description: Amarok sidebar for konqueror 3.x.x
+ This package contains the Amarok sidebar plugin for konqueror from KDE 3
+ series. The sidebar provides a convenient way for a user to control amarok
+ directly from the running konqueror instance.
+
Package: amarok-engines
Architecture: all
-Depends: amarok-xine (>= ${source:Version}), amarok-yauap (>= ${source:Version})
-Description: output engines for the Amarok audio player
- This package depends on all the available Amarok engines. You can
- safely remove it, as you can remove the amarok-$engine packages that
- you don't use.
+Depends: amarok-engine-xine (>= ${source:Version})
+Suggests: amarok-engine-yauap (>= ${source:Version})
+Description: output engines for the Amarok music player
+ This package serves merely as a reference point if you want to install
+ all available Amarok engines. It depends on those Amarok engines that
+ generally can be used by most users and suggests the ones that need special
+ configuration to get working properly. You can safely remove this
+ metapackage as you can remove the amarok-engine-$engine packages that you
+ don't use.
-Package: amarok-xine
+Package: amarok-engine-xine
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: amarok (= ${binary:Version})
-Conflicts: amarok (<< ${binary:Version}), amarok (>> ${binary:Version})
+Recommends: amarok (= ${binary:Version})
+Conflicts: amarok-xine
+Replaces: amarok-xine
Description: xine engine for the Amarok audio player
This package provides the xine engine for Amarok. Xine is capable of
playing most of media formats and usually does not require any
additional configuration therefore this engine is default and highly
recommended.
-Package: amarok-yauap
+Package: amarok-engine-yauap
Architecture: any
Depends: ${shlibs:Depends}
Recommends: amarok (= ${binary:Version})
-Conflicts: amarok (<< ${binary:Version}), amarok (>> ${binary:Version})
Description: yauap engine for the Amarok audio player
This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as means of communication
+ to Yauap Commandline Audio Player. DBus is used as a means of communication
between the engine and Yauap. Please note that this package will be of no
use for you unless you have Yauap Commandline Audio Player installed
and configured properly.
+ .
+ As of writing, Yauap Commandline Audio Player is not packaged for Debian.
Package: amarok-dbg
Priority: extra
@@ -82,5 +110,5 @@
Description: debugging symbols for Amarok
This package provides debugging symbols for all binary packages built from
amarok source package. It's highly recommended to have this package installed
- before reporting any Amarok crashes to either Amarok developers or debian
+ before reporting any Amarok crashes to either Amarok developers or Debian
package maintainers.
Added: kde-extras/amarok/trunk/debian/patches/12_devicemanager_dcopcall_no_timeout.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/12_devicemanager_dcopcall_no_timeout.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/12_devicemanager_dcopcall_no_timeout.diff 2008-02-26 20:29:37 UTC (rev 9474)
@@ -0,0 +1,11 @@
+--- amarok-1.4.8/amarok/src/devicemanager.cpp 2007-12-17 17:53:19.000000000 +0200
++++ amarok-1.4.8/amarok/src/devicemanager.cpp 2008-02-26 20:48:26.000000000 +0200
+@@ -65,7 +65,7 @@
+ QDataStream arg(data, IO_WriteOnly);
+ QStringList result;
+ arg << 5;
+- if (!m_dc->call("kded", "mediamanager", "fullList()", data, replyType, replyData, false, 5000))
++ if (!m_dc->call("kded", "mediamanager", "fullList()", data, replyType, replyData, false, -1))
+ {
+ debug() << "During DeviceManager init, error during DCOP call" << endl;
+ }
Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series 2008-02-26 18:29:21 UTC (rev 9473)
+++ kde-extras/amarok/trunk/debian/patches/series 2008-02-26 20:29:37 UTC (rev 9474)
@@ -5,3 +5,4 @@
05_disable-final.diff -p0
10_queuemedia.patch -p0
11_bug403340_cancel_rename_when_deleting_items.diff -p0
+12_devicemanager_dcopcall_no_timeout.diff
Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules 2008-02-26 18:29:21 UTC (rev 9473)
+++ kde-extras/amarok/trunk/debian/rules 2008-02-26 20:29:37 UTC (rev 9474)
@@ -11,7 +11,6 @@
### VARIABLES
DEB_DH_MAKESHLIBS_ARGS_ALL := -n
DEB_INSTALL_DIRS_amarok := usr/lib/amarok
-DEB_DH_SHLIBDEPS_ARGS_amarok := -Xusr/lib/kde3/konqsidebar_universalamarok.so
DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \
--disable-final \
More information about the pkg-kde-commits
mailing list