rev 9524 - kde-extras/amarok/trunk/debian

[Modestas Vainius]

Author: modax-guest
Date: 2008-03-02 17:26:55 +0000 (Sun, 02 Mar 2008)
New Revision: 9524

Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/control
   kde-extras/amarok/trunk/debian/rules
Log:
* Remove references about unavaibility of Yauap.
* Exclude amarok from amarok-engine-* deps.

Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2008-03-02 17:06:32 UTC (rev 9523)
+++ kde-extras/amarok/trunk/debian/changelog	2008-03-02 17:26:55 UTC (rev 9524)
@@ -40,9 +40,6 @@
       * Add libdbus-qt-1-dev to Build-Depends
       * Pass --with-yauap to configure
       * Add amarok-yauap.install
-      * 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
@@ -94,8 +91,9 @@
   * Do not install COPYING files which are present in some script directories.
     Also remove useless (according to lintian) MacOS X resource fork file
     rubygems/._gem_commands.rb
+  * Exclude amarok from amarok-engine packages dependecy lists.
 
- -- Modestas Vainius <modestas at vainius.eu>  Thu, 28 Feb 2008 00:19:37 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Sun, 02 Mar 2008 19:19:12 +0200
 
 amarok (1.4.8-1) unstable; urgency=low
 

Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control	2008-03-02 17:06:32 UTC (rev 9523)
+++ kde-extras/amarok/trunk/debian/control	2008-03-02 17:26:55 UTC (rev 9524)
@@ -72,15 +72,12 @@
 
 Package: amarok-engines
 Architecture: all
-Depends: amarok-engine-xine (>= ${source:Version})
-Suggests: amarok-engine-yauap (>= ${source:Version})
+Depends: amarok-engine-xine (>= ${source:Version}), 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.
+ generally can be used by most users. You can safely remove this metapackage
+ as you can remove the amarok-engine-$engine packages that you don't use.
 
 Package: amarok-engine-xine
 Architecture: any
@@ -88,24 +85,20 @@
 Recommends: amarok (= ${binary:Version})
 Conflicts: amarok-xine
 Replaces: amarok-xine
-Description: xine engine for the Amarok audio player
+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.
+ additional configuration therefore this engine is default and recommended.
 
 Package: amarok-engine-yauap
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: yauap, ${shlibs:Depends}
 Recommends: amarok (= ${binary:Version})
-Description: yauap engine for the Amarok audio player
+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 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.
+ between the engine and Yauap. Please note that some extra Amarok features 
+ (like visualizations) might not be available while using this engine.
 
 Package: amarok-dbg
 Priority: extra

Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules	2008-03-02 17:06:32 UTC (rev 9523)
+++ kde-extras/amarok/trunk/debian/rules	2008-03-02 17:26:55 UTC (rev 9524)
@@ -30,6 +30,11 @@
 DEB_INSTALL_DOCS_ALL =
 DEB_INSTALL_DOCS_amarok = $(DEB_SRCDIR)/README
 
+# Amarok engines should not auto-depend on amarok. 
+# Appropriate relationships are set manually in the control file.
+DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine = -- -xamarok
+DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap = -- -xamarok
+
 ### Libtool and Automake updates
 # Autoguess automake /usr/share subdirectory. Insure from failures
 DEB_AUTOMAKE_SHARE_DIR = /usr/share/automake-$(shell automake --version | head -n 1 | sed 's/^automake (GNU automake) \([0-9]\+\.[0-9]\+\).*/\1/')