rev 3262 - people/dato/packages/trunk/amarok/debian

[Adeodato Simó]

Author: adeodato
Date: 2006-03-06 04:42:48 +0000 (Mon, 06 Mar 2006)
New Revision: 3262

Added:
   people/dato/packages/trunk/amarok/debian/amarok-arts.install
Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
05:36 <dato> sigh, committed the removal of amarok-arts too soon.

Shipping the aKode engine in amarok-arts...


Added: people/dato/packages/trunk/amarok/debian/amarok-arts.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok-arts.install	2006-03-06 04:25:57 UTC (rev 3261)
+++ people/dato/packages/trunk/amarok/debian/amarok-arts.install	2006-03-06 04:42:48 UTC (rev 3262)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/services/amarok_aKode-engine.desktop
+debian/tmp/usr/lib/kde3/libamarok_aKode-engine.so
+debian/tmp/usr/lib/kde3/libamarok_aKode-engine.la

Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 04:25:57 UTC (rev 3261)
+++ people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 04:42:48 UTC (rev 3262)
@@ -1,9 +1,13 @@
 amarok (1.4-beta2-1) experimental; urgency=low
 
-  * Second beta for the upcoming 1.4 version packaged. Drops:
-    - aRts engine (the amarok-arts package disappears).
-    - GStreamer 0.8 support (amarok-gstreamer now pulls GStreamer 0.10).
+  * Second beta for the upcoming 1.4 version packaged.
 
+    This release drops the aRts engine; in order to keep support for
+    outputting to aRts, ship the aKode engine in the amarok-arts package.
+
+    Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update
+    build-dependencies and amarok-gstreamer's dependencies accordingly.
+
   * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0]
     is overwritten correctly. This closes: #352171 (amaroK not remembering the
     desktop it was on upon login), and incidentally makes Erich Schubert happy.

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2006-03-06 04:25:57 UTC (rev 3261)
+++ people/dato/packages/trunk/amarok/debian/control	2006-03-06 04:42:48 UTC (rev 3262)
@@ -4,7 +4,7 @@
 Maintainer: Adeodato Simó <dato at net.com.org.es>
 Build-Depends: cdbs, debhelper, quilt, bzip2, automake1.9, libtool,
  kdelibs4-dev, kdemultimedia-dev, kdebase-dev,
- libgstreamer0.10-dev, libxine-dev,
+ libakode-dev, libgstreamer0.10-dev, libxine-dev,
  libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp2-dev,
  libmysqlclient15-dev, libpq-dev,
  xmms-dev, libvisual0.2-dev, libsdl1.2-dev,
@@ -33,23 +33,31 @@
    - easy bindable global shortcuts, rich DCOP interface
    - On-Screen Display (OSD), on track change or at keypress
  .
- amaroK can output to different sound systems: GStreamer and XINE
- support is included in the amarok-{gstreamer,xine} packages,
+ amaroK can output to different sound systems: aRts, GStreamer and XINE
+ support is included in the amarok-{arts,gstreamer,xine} packages,
  respectively. By default, all of them will be installed (amarok-engines
- package).
+ meta-package).
  .
  Support for XMMS and libvisual visualization plugins is also compiled in (you
  need to have xmms or libvisual0.2-plugins installed to be able to use it).
 
 Package: amarok-engines
 Architecture: any
-Depends: amarok (= ${Source-Version}), amarok-gstreamer, amarok-xine
+Depends: amarok (= ${Source-Version}), amarok-arts, amarok-gstreamer, amarok-xine
 Description: output engines for the amaroK audio player
  This package depends on all the available amaroK engines, and it's
  installed by default unless you specify a particular engine. You can
  safely remove it, as you can remove the amarok-$engine packages that
  you don't use.
 
+Package: amarok-arts
+Architecture: any
+Depends: amarok (= ${Source-Version}), libarts1-akode, ${shlibs:Depends}
+Provides: amarok-engine
+Description: aKode engine for the amaroK audio player, providing aRts support
+ This package provides the aKode engine for amaroK, which will output sound to
+ the KDE sound system, the aRts daemon.
+
 Package: amarok-gstreamer
 Architecture: any
 Depends: amarok (= ${Source-Version}),

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2006-03-06 04:25:57 UTC (rev 3261)
+++ people/dato/packages/trunk/amarok/debian/rules	2006-03-06 04:42:48 UTC (rev 3262)
@@ -20,7 +20,6 @@
 			      -Xusr/lib/kde3/konqsidebar_universalamarok.so
 
 DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \
-				--without-akode \
 				--with-ifp \
 				--with-libgpod \
 				--enable-mysql \