[Pkg-kde-commits] rev 221 - in people/dato/packages: tags trunk trunk/amarok trunk/amarok/debian trunk/amarok/debian/overrides trunk/amarok/debian/patches

Adeodato Sim?? dato-guest@haydn.debian.org
Mon, 08 Nov 2004 18:26:02 -0700


Author: dato-guest
Date: 2004-11-08 18:25:44 -0700 (Mon, 08 Nov 2004)
New Revision: 221

Added:
   people/dato/packages/tags/amarok/
   people/dato/packages/trunk/amarok/
   people/dato/packages/trunk/amarok/debian/
   people/dato/packages/trunk/amarok/debian/TODO
   people/dato/packages/trunk/amarok/debian/amarok-arts.install
   people/dato/packages/trunk/amarok/debian/amarok-gstreamer.install
   people/dato/packages/trunk/amarok/debian/amarok-xine.install
   people/dato/packages/trunk/amarok/debian/amarok.1
   people/dato/packages/trunk/amarok/debian/amarok.install
   people/dato/packages/trunk/amarok/debian/amarok.manpages
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/compat
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/copyright
   people/dato/packages/trunk/amarok/debian/overrides/
   people/dato/packages/trunk/amarok/debian/overrides/amarok-arts
   people/dato/packages/trunk/amarok/debian/patches/
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
   people/dato/packages/trunk/amarok/debian/patches/taglib-1.2-suffices.patch
   people/dato/packages/trunk/amarok/debian/rules
   people/dato/packages/trunk/amarok/debian/substvars
Log:
Initial import of amarok 1.1.1-1

Added: people/dato/packages/trunk/amarok/debian/TODO
===================================================================
--- people/dato/packages/trunk/amarok/debian/TODO	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/TODO	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,4 @@
+- link dynamically against sqlite once 3.0 enters Debian (#272271).
+- remove debian/patches/taglib-1.2-suffices.patch once taglib 1.3 enters
+  Debian (#273029).
+- do something wrt --disable-maintainer-mode.

Added: people/dato/packages/trunk/amarok/debian/amarok-arts.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok-arts.install	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok-arts.install	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,6 @@
+debian/tmp/usr/share/services/amarok_artsengine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_artsengine_plugin.so
+debian/tmp/usr/lib/kde3/libamarok_artsengine_plugin.la
+debian/tmp/usr/lib/libamarokarts.so
+debian/tmp/usr/lib/libamarokarts.la
+debian/tmp/usr/lib/mcop/*

Added: people/dato/packages/trunk/amarok/debian/amarok-gstreamer.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok-gstreamer.install	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok-gstreamer.install	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/services/amarok_gstengine_plugin.desktop
+debian/tmp/usr/share/config.kcfg/gstconfig.kcfg
+debian/tmp/usr/lib/kde3/libamarok_gstengine_plugin.so
+debian/tmp/usr/lib/kde3/libamarok_gstengine_plugin.la

Added: people/dato/packages/trunk/amarok/debian/amarok-xine.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok-xine.install	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok-xine.install	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/services/amarok_xine-engine.desktop
+debian/tmp/usr/share/services/amarok_xineengine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_xine-engine.so
+debian/tmp/usr/lib/kde3/libamarok_xine-engine.la

Added: people/dato/packages/trunk/amarok/debian/amarok.1
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.1	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok.1	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,181 @@
+.\" Generated by kdemangen.pl and edited by hand
+.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE"
+.SH NAME
+amarok
+\- An audio player for KDE
+.SH SYNOPSIS
+amarok [Qt-options] [KDE-options] [URL(s)] 
+.SH DESCRIPTION
+amaroK is a multimedia player based on the soundserver-independent framework.
+There are many media players around these days, true. What's missing from most
+players is a user interface, that doesn't get in the way of the user.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Arguments:
+URL(s)                    Files/URLs to Open
+.SS 
+.SS Options:
+.TP
+.B \-r,  \-\-previous  
+Skip backwards in playlist
+.TP
+.B \-p,  \-\-play  
+Start playing current playlist
+.TP
+.B \-s,  \-\-stop  
+Stop playback
+.TP
+.B  \-\-pause  
+Pause playback
+.TP
+.B \-f,  \-\-next  
+Skip forwards in playlist
+.SS 
+.SS Additional options:
+.TP
+.B \-e,  \-\-enqueue  
+Enqueue Files/URLs
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/amarok/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/amarok/'"
+from the command-line.
+.BR
+.SH AUTHORS
+.NF
+Christian Muehlhaeuser <chris@chris.de>
+.BR
+Mark Kretschmann <markey@web.de>
+.BR
+Max Howell <max.howell@methylblue.com>
+.BR
+Stanislav Karchebny <berk@upnet.ru>
+.BR
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.BR
+.SH OTHER
+This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
+system (but may be used by others).
+.BR

Added: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok.install	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,19 @@
+debian/tmp/usr/share/apps/amarok/*
+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/servicetypes/amarok_plugin.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_append.desktop
+
+debian/tmp/usr/share/services/amarok_void-engine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la
+debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so
+
+debian/tmp/usr/bin/amarok
+debian/tmp/usr/bin/amarokapp
+debian/tmp/usr/bin/amarok_xmmswrapper2
+
+debian/tmp/etc/*

Added: people/dato/packages/trunk/amarok/debian/amarok.manpages
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.manpages	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/amarok.manpages	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1 @@
+debian/amarok.1

Added: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/changelog	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,158 @@
+amarok (1.1.1-1) unstable; urgency=low
+
+  * New upstream release packaged. Most notably, fixes several GStreamer
+    engine related bugs.
+
+  * debian/control: add to amarok-gstreamer's description that is not possible
+    to use artssink for output.
+
+  * debian/rules:
+    - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS).
+
+  * debian/patches/:
+    - removed proper-otherlang-handbook-path.patch, issue fixed upstream.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sat, 09 Oct 2004 22:51:06 +0200
+
+amarok (1.1.0-2) unstable; urgency=low
+
+  * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not
+    kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
+
+amarok (1.1.0-1) unstable; urgency=low
+
+  * New upstream version:
+    - several last minute fixes.
+    - includes handbook in several languages (da, et, fr, it, pt, sv).
+
+  * First upload to Debian (closes: #236696).
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 01:53:56 +0200
+
+amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low
+
+  * New maintainer. Thanks to Peter Rockai for his initial work.
+
+  * Updated to amaroK 1.1 CVS (2004-09-24):
+    - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is
+      required and is not available in Debian (requested in #272271).
+    - added debian/patches/taglib-1.2-suffices.patch to lower the requirement
+      from taglib 1.3 (requested in #273029) to 1.2, which is enough.
+    - new package amarok-xine (yet another engine for amaroK, hurray!)
+    - added the following Build-Dependencies:
+      + libkjsembed-dev (amaroK is now JavaScript scriptable).
+      + libtunepimp2-dev (MusicBrainz support).
+      + libxine-dev (for the xine engine).
+      + libtag1-dev (missing).
+
+  * New package amarok-engines:
+    - depends on all the available engine packages and will be installed by
+      default unless the user specifies an specific engine.
+    - all the amarok-* packages Provide: amarok-engine, and amarok now
+      Depends: amarok-engines | amarok-engine.
+
+  * Removed the amarok-xmms package:
+    - its single binary amarok_xmmswrapper2 is now included in the main amarok
+      package.
+    - include some hackery to prevent amarok from depending on xmms (!).
+      amaroK just does a no-op and issues a warning on stderr if xmms is not
+      installed and user opens the visualizations menu, so this seems safe.
+      A xmms-lib package (in which amarok could easily depend) is requested in
+      #272913.
+
+  * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of
+    /usr/bin:
+    - needed for FHS/Debian Policy compliance.
+    - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in
+      source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp).
+
+  * Added lintian overrides for an aRts module which must go in /usr/lib
+    despite not being a shared library. noatun and some other arts-related
+    packages have the same problem, if someone has a solution please share.
+
+  * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok.
+
+  * Do not make amarok-arts depend on the meta-package "arts"; the
+    dependencies given by ${shlib:Depends} do suffice.
+
+  * debian/control: updated to Standars-Version 3.6.1.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 24 Sep 2004 02:49:46 +0200
+
+amarok (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Thu,  5 Aug 2004 14:23:23 +0200
+
+amarok (1.0.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Make depends among amarok packages versioned
+  * Prepare to upload into Debian, closes: #236696
+  * Add manpage for amarok by Alejandro Exojo
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 30 Jun 2004 23:24:16 +0200
+
+amarok (1.0.0-3) unstable; urgency=low
+
+  * Dynamically link against libsqlite0
+  * Fix gstreamer dependencies
+  * Various small fixes (sections, descriptions, doc dirs)
+  * Thanks go to Adeodato Simó for help with various issues
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 26 Jun 2004 23:06:00 +0200
+
+amarok (1.0.0-2) unstable; urgency=low
+
+  * Make the depends on amarok-gstreamer a bit more tight. Only depend on
+    audiosink, recommend the decoder plugins.
+  * Make the amarok engines depend on amarok itself.
+  * Compile with xmms visualisation support.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 23 Jun 2004 13:58:12 +0200
+
+amarok (1.0.0-1) unstable; urgency=low
+
+  * Build official 1.0.0 release.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:48:52 +0200
+
+amarok (1.0-pre1-2) unstable; urgency=low
+
+  * Fix amarok-arts package, was missing mcop files. Duh.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:25:29 +0200
+
+amarok (1.0-pre1-1) unstable; urgency=low
+
+  * First 1.0.0 prerelease.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 10:18:31 +0200
+
+amarok (1.0-beta4-2) unstable; urgency=low
+
+  * Patch to final beta4 version.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 17:47:53 +0200
+
+amarok (1.0-beta4-1) unstable; urgency=low
+
+  * New upstream RC (beta4-rc1).
+  * Build with GST support.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 10:24:09 +0200
+
+amarok (1.0-beta3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 29 May 2004 17:08:55 +0200
+
+amarok (1.0-beta1-0) workstation-unstable; urgency=low
+
+  * Initial packaging
+
+ -- Peter Rockai (mornfall) <mornfall@mornfall.homeip.net>  Sun, 11 Apr 2004  17:05:00 +0200

Added: people/dato/packages/trunk/amarok/debian/compat
===================================================================
--- people/dato/packages/trunk/amarok/debian/compat	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/compat	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1 @@
+4

Added: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/control	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,80 @@
+Source: amarok
+Section: kde
+Priority: optional
+Maintainer: Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), libkjsembed-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>= 1.2), libxine-dev (>= 1-rc4), libsqlite0-dev, xmms-dev, libtunepimp2-dev
+Standards-Version: 3.6.1
+
+Package: amarok
+Architecture: any
+Depends: amarok-engines | amarok-engine, ${shlibs:Depends}
+Description: versatile and easy to use audio player for KDE
+ amaroK tries to be a little different, providing a simple drag and drop
+ interface that really makes playlist handling easy.
+ .
+ Features include:
+   - rapid playlist creation, with drag and drop from a directory view
+   - nice playlist browser for your existing playlists (PLS or M3U formats)
+   - collection-indexing support, for smart browsing and playlist creation
+   - possibility of accessing media via kioslaves, allowing you to play
+     via smb:// or fish:// (normal streams are of course supported)
+   - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
+   - album cover support: automatically displays album covers from the
+     filesystem, or downloaded on the fly
+   - miscellaneous audio effects, including crossfading
+   - easy bindable global shortcuts, rich DCOP interface
+   - On-Screen Display (OSD), on track change or at keypress
+ .
+ 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).
+ .
+ Support for XMMS visualization plugins is also compiled in (you need to
+ have xmms installed to be able to use it, though).
+
+Package: amarok-engines
+Architecture: any
+Depends: amarok (= ${Source-Version}), ${enginePackages}, ${shlibs:Depends}
+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}), ${shlibs:Depends}
+Provides: amarok-engine
+Description: aRts engine for the amaroK audio player
+ This package provides the aRts engine for amaroK. Most KDE users will
+ find this engine to just work for them.
+
+Package: amarok-gstreamer
+Architecture: any
+Depends: amarok (= ${Source-Version}), ${gstreamer:Depends}, ${shlibs:Depends}
+Recommends: ${gstreamer:Recommends}
+Suggests: ${gstreamer:Suggests}
+Provides: amarok-engine
+Description: GStreamer engine for the amaroK audio player
+ This package provides the GStreamer engine for amaroK, which you may
+ need if GStreamer is your sound-system of choice or to play some of the
+ audio formats that gstreamer-plugins support but the other engines
+ don't.
+ .
+ The default audiosink that will be installed this package is OSS, but
+ amaroK works with most other audiosinks (e.g., ALSA); there is an option
+ in the configuration dialog to select the preferred sink and device.
+ .
+ Note that you can't use this package and output sound into aRts,
+ since this engine will not allow artssink to be used. amarok-arts and
+ amarok-xine are the only options if aRts output is required.
+
+Package: amarok-xine
+Architecture: any
+Depends: amarok (= ${Source-Version}), ${shlibs:Depends}
+Provides: amarok-engine
+Description: xine engine for the amaroK audio player
+ This package provides the xine engine for amaroK, which you may prefer
+ for some reason over the other engines (e.g., it is the lightest engine
+ Dependency-wise).

Added: people/dato/packages/trunk/amarok/debian/copyright
===================================================================
--- people/dato/packages/trunk/amarok/debian/copyright	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/copyright	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,39 @@
+This package was debianized by Peter Rockai (mornfall)
+<mornfall@mornfall.homeip.net> on
+Sun, 11 Apr 2004 17:06:00 +0200.
+
+Adeodato Simó <asp16@alu.ua.es> took over the maintenance on 
+Wed, 22 Sep 2004 06:04:25 +0200.
+
+It was downloaded from http://amarok.kde.org/
+
+Upstream Authors:
+	Christian Muehlhaeuser <chris@chris.de>
+	Frederik Holljen <fh@ez.no>
+	Mark Kretschmann <markey@web.de>
+	Max Howell <max.howell@methylblue.com>
+	Mike Diehl <madpenguin8@yahoo.com>
+	Roman Becker <roman@formmorf.de>
+	Stanislav Karchebny <berk@inbox.ru>
+
+Copyright:
+(c) 2002-2003, Mark Kretschmann
+(c) 2003-2004, the amaroK developers
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL file.

Added: people/dato/packages/trunk/amarok/debian/overrides/amarok-arts
===================================================================
--- people/dato/packages/trunk/amarok/debian/overrides/amarok-arts	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/overrides/amarok-arts	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1 @@
+amarok-arts: no-shlibs-control-file usr/lib/libamarokarts.so

Added: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,39 @@
+--- amarok/src/loader/loader.cpp.orig	2004-09-23 21:17:31.000000000 +0200
++++ amarok/src/loader/loader.cpp	2004-09-23 21:18:21.000000000 +0200
+@@ -88,7 +88,7 @@
+                 //and if we did it KCmdLineArgs would make us exit!
+                 //TODO add all arguments or something
+ 
+-                QProcess proc( QString("amarokapp") );
++                QProcess proc( QString("/usr/lib/amarok/amarokapp") );
+                 proc.setCommunication( 0 );
+                 proc.addArgument( arg );
+                 proc.start();
+@@ -122,7 +122,7 @@
+         //no, amaroK is not running -> start new instance, show splash
+         std::cout << "[amaroK loader] amaroK not running. Trying to start it..\n";
+ 
+-        QStringList args( "amarokapp" );
++        QStringList args( "/usr/lib/amarok/amarokapp" );
+         for ( int i = 1; i < argc; i++ ) args << argv[ i ]; //start at 1 to avoid appName
+ 
+         QProcess proc( args );
+--- amarok/src/socketserver.cpp	2004-09-23 18:15:16.000000000 +0200
++++ amarok/src/socketserver.cpp.debian	2004-09-23 18:17:57.000000000 +0200
+@@ -250,14 +250,14 @@
+ 
+     //can I get a pointer to the data section of a QCString?
+     char str[4096];
+-    FILE *vis = popen( "amarok_xmmswrapper2 --list", "r" );
++    FILE *vis = popen( "/usr/lib/amarok/amarok_xmmswrapper2 --list", "r" );
+     str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+     pclose( vis );
+ 
+     QStringList entries = QStringList::split( '\n', str );
+ 
+     for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
+-        new Item( this, "amarok_xmmswrapper2", *it );
++        new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it );
+ 
+     vis = popen( "amarok_libvisual --list", "r" );
+     str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';

Added: people/dato/packages/trunk/amarok/debian/patches/taglib-1.2-suffices.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/taglib-1.2-suffices.patch	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/patches/taglib-1.2-suffices.patch	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,11 @@
+--- configure	2004-09-23 09:18:46.000000000 +0200
++++ configure.debian	2004-09-23 18:12:18.000000000 +0200
+@@ -30153,7 +30153,7 @@
+ # BEGIN TAGLIB CHECK
+ ###############################################################################
+ 
+-TAGLIB_REQ_VERSION="1.3";
++TAGLIB_REQ_VERSION="1.2";
+ 
+ 
+ # Extract the first word of "taglib-config", so it can be a program name with args.

Added: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/rules	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+### CDBS INCLUDES
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+### VARIABLES
+DEB_DH_MAKESHLIBS_ARGS_ALL := -n
+DEB_INSTALL_DIRS_amarok    := usr/lib/amarok
+DEB_DH_SHLIBDEPS_ARGS      := -Xusr/lib/amarok/amarok_xmmswrapper2
+DEB_DH_INSTALL_ARGS        := --list-missing
+
+# We need this commented out until sqlite 3.0 is available in Debian
+# DEB_EXTRA_CONNFIGURE_FLAGS := --without-included-sqlite
+
+### COMMON STUFF
+common-binary-arch::
+	# Use debian/substvars
+	for p in $(DEB_ALL_PACKAGES); do \
+	  cat debian/substvars >>debian/$$p.substvars; \
+	done
+	# Install lintian overrides
+	p=amarok-arts; \
+	dh_install -p$$p debian/overrides/$$p usr/share/lintian/overrides/
+
+### POST-INSTALL HACKING
+# Non-user binaries in /usr/lib, not /usr/bin
+binary-post-install/amarok::
+	p=`basename $@`; \
+	mv debian/$$p/usr/bin/amarokapp           debian/$$p/usr/lib/amarok; \
+	mv debian/$$p/usr/bin/amarok_xmmswrapper2 debian/$$p/usr/lib/amarok
+
+# Make directories in /usr/share/doc be symlinks for packages other than amarok
+common-binary-post-install-arch::
+	for p in $(filter-out amarok,$(DEB_ALL_PACKAGES)); do \
+	  rm -rf debian/$$p/usr/share/doc/$$p; \
+	  ln -sf amarok debian/$$p/usr/share/doc/$$p; \
+	done


Property changes on: people/dato/packages/trunk/amarok/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: people/dato/packages/trunk/amarok/debian/substvars
===================================================================
--- people/dato/packages/trunk/amarok/debian/substvars	2004-11-08 22:15:32 UTC (rev 220)
+++ people/dato/packages/trunk/amarok/debian/substvars	2004-11-09 01:25:44 UTC (rev 221)
@@ -0,0 +1,4 @@
+gstreamer:Depends=gstreamer0.8-oss | gstreamer0.8-audiosink, gstreamer0.8-misc, gstreamer0.8-mad, gstreamer0.8-vorbis
+gstreamer:Recommends=gstreamer0.8-flac, gstreamer0.8-audiofile
+gstreamer:Suggests=gstreamer0.8-plugins
+enginePackages=amarok-arts, amarok-gstreamer, amarok-xine