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

[Adeodato Simó]

Author: adeodato
Date: 2006-03-06 23:27:15 +0000 (Mon, 06 Mar 2006)
New Revision: 3281

Removed:
   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:
Second upload for amarok's 1.4-beta2.


Deleted: people/dato/packages/trunk/amarok/debian/amarok-arts.install

Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 23:04:30 UTC (rev 3280)
+++ people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 23:27:15 UTC (rev 3281)
@@ -1,3 +1,14 @@
+amarok (1.4-beta2-2) experimental; urgency=low
+
+  * Fix yesterday's brainfart: aKode can't output to aRts, so remove this
+    statement from the description.
+    
+  * In addition, and after a bit of chit-chat with upstream, follow their
+    wishes and not package aKode at all (bye amarok-arts), and don't include
+    GStreamer 0.10 support for now.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Mon,  6 Mar 2006 23:37:43 +0100
+
 amarok (1.4-beta2-1) experimental; urgency=low
 
   * Second beta for the upcoming 1.4 version packaged.

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2006-03-06 23:04:30 UTC (rev 3280)
+++ people/dato/packages/trunk/amarok/debian/control	2006-03-06 23:27:15 UTC (rev 3281)
@@ -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,
- libakode-dev, libgstreamer0.10-dev, libxine-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,
@@ -34,33 +34,24 @@
    - On-Screen Display (OSD), on track change or at keypress
    - iPod and iRiver support
  .
- 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
- meta-package).
+ amaroK can output to different sound systems: GStreamer and XINE support is
+ included in the amarok-{gstreamer,xine} packages, respectively. By default,
+ all of them will be installed (amarok-engines 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-arts, amarok-gstreamer, amarok-xine
+Depends: amarok (= ${Source-Version}), 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
+Architecture: none
 Depends: amarok (= ${Source-Version}),
  gstreamer0.10-alsa | gstreamer0.10-audiosink,
  gstreamer0.10-plugins-base,

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2006-03-06 23:04:30 UTC (rev 3280)
+++ people/dato/packages/trunk/amarok/debian/rules	2006-03-06 23:27:15 UTC (rev 3281)
@@ -20,6 +20,8 @@
 			      -Xusr/lib/kde3/konqsidebar_universalamarok.so
 
 DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \
+				--without-akode \
+				--without-gstreamer10 \
 				--with-ifp \
 				--with-libgpod \
 				--enable-mysql \