rev 3125 - in people/jriddell: . amarok amarok/debian
amarok/debian/cdbs amarok/debian/icons
amarok/debian/overrides amarok/debian/patches
Jonathan Riddell
jriddell-guest at costa.debian.org
Tue Feb 14 14:27:52 UTC 2006
Author: jriddell-guest
Date: 2006-02-14 14:27:50 +0000 (Tue, 14 Feb 2006)
New Revision: 3125
Added:
people/jriddell/amarok/
people/jriddell/amarok/debian/
people/jriddell/amarok/debian/README.Debian
people/jriddell/amarok/debian/TODO
people/jriddell/amarok/debian/amarok-arts.install
people/jriddell/amarok/debian/amarok-gstreamer.install
people/jriddell/amarok/debian/amarok-xine.install
people/jriddell/amarok/debian/amarok.1
people/jriddell/amarok/debian/amarok.install
people/jriddell/amarok/debian/amarok.manpages
people/jriddell/amarok/debian/amarok.menu
people/jriddell/amarok/debian/cdbs/
people/jriddell/amarok/debian/cdbs/kde.mk
people/jriddell/amarok/debian/changelog
people/jriddell/amarok/debian/compat
people/jriddell/amarok/debian/control
people/jriddell/amarok/debian/copyright
people/jriddell/amarok/debian/icons/
people/jriddell/amarok/debian/icons/amarok-16.xpm
people/jriddell/amarok/debian/icons/amarok.xpm
people/jriddell/amarok/debian/overrides/
people/jriddell/amarok/debian/overrides/amarok-arts
people/jriddell/amarok/debian/patches/
people/jriddell/amarok/debian/patches/am_maintainer_mode.patch
people/jriddell/amarok/debian/patches/disable-final.diff
people/jriddell/amarok/debian/patches/disable_no_undefined.patch
people/jriddell/amarok/debian/patches/gmo_files_at_build_time.patch
people/jriddell/amarok/debian/patches/kubuntu_01_kdepot.diff
people/jriddell/amarok/debian/patches/kubuntu_02_read_kubuntu_config.diff
people/jriddell/amarok/debian/patches/no_libadd_in_convenience_libs.diff
people/jriddell/amarok/debian/patches/some-binaries-in-usr-lib.patch
people/jriddell/amarok/debian/patches/taglib-1.3.1-suffices.diff
people/jriddell/amarok/debian/rules
people/jriddell/amarok/debian/substvars
Log:
Quick amarok 1.4 packages
some-binaries-in-usr-lib.patch updated
akode engine just added to arts package for now
Added: people/jriddell/amarok/debian/README.Debian
===================================================================
--- people/jriddell/amarok/debian/README.Debian 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/README.Debian 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,31 @@
+amaroK packages for Debian
+==========================
+
+ A couple of notes which you may find useful:
+
+ - if you want amarok to be able to play CDs, you need to install the
+ kdemultimedia-kio-plugins package.
+
+ - the scripts available in the 'Scripts' menu need that you install
+ some other packages for them to work. Those packages are listed in
+ the Suggest: field of the amarok package.
+
+ - these Debian packages ship the amarokapp and amarok_xmmswrapper2
+ binaries in /usr/lib/amarok instead of /usr/bin, which upstream
+ does. This is done to comply with Debian Policy, which mandates
+ that binaries not meant to be invoked by the user shall not reside
+ in /usr/bin.
+
+ You should experience no problems because of this change. If you
+ do, please let me now.
+
+ Also, users not using the full KDE environment may get the following
+ error when executing amarok for the first time: "Socket-path is not a
+ link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute:
+
+ $ lnusertemp socket
+
+ Note that you only need to execute it once, not each time that you
+ start amaroK.
+
+ -- Adeodato Simó <asp16 at alu.ua.es>
Added: people/jriddell/amarok/debian/TODO
===================================================================
--- people/jriddell/amarok/debian/TODO 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/TODO 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,2 @@
+- cdbs/kde.mk from svn.debian.org/pkg-kde sets DEB_INSTALL_DOCS_ALL to
+ empty.
Added: people/jriddell/amarok/debian/amarok-arts.install
===================================================================
--- people/jriddell/amarok/debian/amarok-arts.install 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok-arts.install 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,11 @@
+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/*
+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
+
+debian/overrides/amarok-arts /usr/share/lintian/overrides
Added: people/jriddell/amarok/debian/amarok-gstreamer.install
===================================================================
--- people/jriddell/amarok/debian/amarok-gstreamer.install 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok-gstreamer.install 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,5 @@
+debian/tmp/usr/share/services/amarok_gstengine_plugin.desktop
+debian/tmp/usr/share/config.kcfg/gstconfig.kcfg
+debian/tmp/usr/share/services/amarok_gstengine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_gstengine_plugin.so
+debian/tmp/usr/lib/kde3/libamarok_gstengine_plugin.la
Added: people/jriddell/amarok/debian/amarok-xine.install
===================================================================
--- people/jriddell/amarok/debian/amarok-xine.install 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok-xine.install 2006-02-14 14:27:50 UTC (rev 3125)
@@ -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
Added: people/jriddell/amarok/debian/amarok.1
===================================================================
--- people/jriddell/amarok/debian/amarok.1 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok.1 2006-02-14 14:27:50 UTC (rev 3125)
@@ -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 at chris.de>
+.BR
+Mark Kretschmann <markey at web.de>
+.BR
+Max Howell <max.howell at methylblue.com>
+.BR
+Stanislav Karchebny <berk at 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 at badopi.org> for the Debian
+system (but may be used by others).
+.BR
Added: people/jriddell/amarok/debian/amarok.install
===================================================================
--- people/jriddell/amarok/debian/amarok.install 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok.install 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,38 @@
+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/servicetypes/amarok_plugin.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_append.desktop
+
+debian/tmp/usr/share/services/amarok_vfat-mediadevice.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/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/konqsidebar_universalamarok.la
+debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
+
+debian/tmp/usr/bin/amarok
+debian/tmp/usr/bin/amarokapp /usr/lib/amarok
+debian/tmp/usr/bin/amarok_xmmswrapper2 /usr/lib/amarok
+
+debian/tmp/usr/lib/libamarok.so.0.0.0
+debian/tmp/usr/lib/libamarok.so.0
+debian/tmp/usr/lib/libamarok.so
+debian/tmp/usr/lib/libamarok.la
+
+debian/tmp/usr/lib/kde3/libamarok_vfat-mediadevice.so
+debian/tmp/usr/lib/kde3/libamarok_vfat-mediadevice.la
+debian/tmp/usr/bin/amarokcollectionscanner
+
+debian/tmp/etc/*
+
+debian/icons/* /usr/share/pixmaps
Added: people/jriddell/amarok/debian/amarok.manpages
===================================================================
--- people/jriddell/amarok/debian/amarok.manpages 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok.manpages 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1 @@
+debian/amarok.1
Added: people/jriddell/amarok/debian/amarok.menu
===================================================================
--- people/jriddell/amarok/debian/amarok.menu 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/amarok.menu 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,8 @@
+?package(amarok):\
+ needs="X11"\
+ section="Apps/Sound"\
+ hints="KDE"\
+ title="amaroK"\
+ icon32x32="/usr/share/pixmaps/amarok.xpm"\
+ icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ command="/usr/bin/amarok"
Added: people/jriddell/amarok/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/amarok/debian/cdbs/kde.mk 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/cdbs/kde.mk 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,93 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney at debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+ -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+ if test -n "$(DEB_KDE_APIDOX)"; then \
+ $(DEB_MAKE_INVOKE) apidox; \
+ fi
+ touch debian/stamp-apidox
+
+common-post-build-arch::
+ mkdir -p po
+ XGETTEXT=/usr/bin/kde-xgettext sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+ if test -n "$(DEB_KDE_APIDOX)"; then \
+ $(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+ fi
+
+clean::
+ rm -f debian/stamp-apidox
+ rm -rf po
+
+buildprep: clean apply-patches
+ make -f admin/Makefile.common dist
+ debian/rules clean
+
+endif
Added: people/jriddell/amarok/debian/changelog
===================================================================
--- people/jriddell/amarok/debian/changelog 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/changelog 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,592 @@
+amarok (2:1.4-beta1-0ubuntu1) dapper; urgency=low
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 13 Feb 2006 11:55:12 +0000
+
+amarok (2:1.3.8-0ubuntu2) dapper; urgency=low
+
+ * Remove GStreamer 0.8 support, default to xine
+ * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 1 Feb 2006 11:56:01 +0000
+
+amarok (2:1.3.8-0ubuntu1) dapper; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 15 Jan 2006 19:10:14 +0000
+
+amarok (2:1.3.7-0ubuntu4) dapper; urgency=low
+
+ * weaken build dependencies
+
+ -- Reinhard Tartler <siretart at ubuntu.com> Fri, 30 Dec 2005 14:55:13 +0100
+
+amarok (2:1.3.7-0ubuntu3) dapper; urgency=low
+
+ * Add kubuntu_02_read_kubuntu_config.diff to make it read Kubuntu's
+ amarokrc file, which hides the splash screen
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 15 Dec 2005 20:13:28 +0000
+
+amarok (2:1.3.7-0ubuntu2) dapper; urgency=low
+
+ * debian/control: Removed the text about libvisual. There is no libvisual
+ support right now in ubuntu
+
+ -- Stephan Hermann <sh at sourcecode.de> Wed, 7 Dec 2005 23:52:58 +0100
+
+amarok (2:1.3.7-0ubuntu1) dapper; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 6 Dec 2005 20:59:31 +0000
+
+amarok (2:1.3.6-1ubuntu3) dapper; urgency=low
+
+ * Make amarok-gstreamer default engine
+ * Add kubuntu_01_kdepot.diff for pot generation
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 29 Nov 2005 19:18:38 +0000
+
+amarok (2:1.3.6-1ubuntu2) dapper; urgency=low
+
+ * debian/substvars: moved gstreamer0.8-mad to Suggests section
+ * Update kde.mk for .pot generation
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 26 Nov 2005 02:52:27 +0000
+
+amarok (2:1.3.6-1ubuntu1) dapper; urgency=low
+
+ * Sync with debian, and readded the Ubuntu specific Epoch
+ * Merged the debian/changelog
+ * debian/control:
+ - Removed libvisual-dev, libsdl1.2-dev from build-deps
+ - Removed libvisual-plugins from Suggests
+ * debian/amarok.install: prevent installing amarok_libvisual
+
+ -- Stephan Hermann <sh at sourcecode.de> Sun, 20 Nov 2005 18:32:06 +0100
+
+amarok (1.3.6-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+
+ + last.fm submissions are properly saved on disk while offline again; they
+ had been broken by Qt 3.3.5. (Closes: #334469, #337109)
+ + includes missing semicolon in amarok.desktop. (Closes: #336026)
+
+ * Update my e-mail address in debian/control.
+
+ -- Adeodato Simó <dato at the-barrel.org> Tue, 08 Nov 2005 10:40:42 +0100
+
+amarok (1.3.5-1) unstable; urgency=low
+
+ * New upstream bugfix release, quickly released to fix a potential crash at
+ startup (upstream #114983).
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Tue, 25 Oct 2005 14:55:29 +0200
+
+amarok (1.3.4-1) unstable; urgency=low
+
+ * New upstream bugfix release, which makes this maintainer of yours
+ immensely happy because a fix for upstream #114195 is included.
+ ("Collection scanner ignored files with non-ascii characters").
+
+ * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for
+ the heads-up. Changes needed:
+
+ + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends.
+ + add libvisual0.2-plugins to Suggests, and mention it in the paragraph
+ regarding visualization plugins in amarok's description.
+ + add the appropriate snippet to some-binaries-in-usr-lib.patch in order
+ to cope with amarok_libvisual installed in /usr/lib/amarok instead of
+ /usr/bin, as mandated by Policy.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Mon, 24 Oct 2005 09:30:22 +0200
+
+amarok (1.3.3-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+
+ + does not loose playlist / podcasts on restart. (Closes: #329878)
+ + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630)
+
+ * Updated the Debian menu icons to the new logo.
+
+ * Updated copyright notice, list of authors, and FSF postal address in
+ debian/copyright.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Thu, 13 Oct 2005 00:04:34 +0200
+
+amarok (1.3.2-1) unstable; urgency=low
+
+ * New upstream bugfix release, featuring the return of alsasink support.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Wed, 21 Sep 2005 04:14:52 +0200
+
+amarok (1.3.1-2) unstable; urgency=low
+
+ * Use g++ 3.4 in arm, m68k and hppa.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Tue, 06 Sep 2005 00:21:03 +0200
+
+amarok (1.3.1-1) unstable; urgency=low
+
+ * New upstream bugfix release. Beware, though, that the GStreamer engine has
+ been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage.
+
+ * Use the internal copy of sqlite for now. This fixes the collection being
+ non functional with SQLite 3.2.5 due to this version preventing a database
+ handle opened in one thread to be used in another. See Bug#326648 for
+ reference. (Closes: #326562, #312386)
+
+ * Enable PostgreSQL support (closes: #326612, #326713):
+
+ + debian/rules: pass --enable-postgresql to ./configure.
+ + debian/control: add libpq-dev to Build-Depends.
+
+ (Before somebody comes around with the word "bloat" ready, libpq4 is 6
+ times smaller than libmysqlclient14.)
+
+ * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not
+ using LIBADD in the statusbar convenience lib. The Depends line had gained
+ some weight in 1.2.3-1.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Mon, 05 Sep 2005 20:57:41 +0200
+
+amarok (2:1.3.1-0ubuntu4) breezy; urgency=low
+
+ * Add kubuntu_02_column_sort_crash.diff fix a
+ crash on column sort http://bugs.kde.org/113042
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 4 Oct 2005 16:14:12 +0100
+
+amarok (2:1.3.1-0ubuntu3) breezy; urgency=low
+
+ * Add kubuntu_01_alsasink.diff to fix and reenable alsasink
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 3 Oct 2005 22:40:05 +0100
+
+amarok (2:1.3.1-0ubuntu2) breezy; urgency=low
+
+ * debian/control: added khelpcenter as suggestion
+
+ -- Stephan Hermann <sh at sourcecode.de> Sat, 17 Sep 2005 02:23:08 +0200
+
+amarok (2:1.3.1-0ubuntu1) breezy; urgency=low
+
+ * New Upstream Release
+ * Merged the Debian package from Adeodato Simó
+ * debian/substvars: moved gstreamer0.8-mad to Suggests section
+
+ -- Stephan Hermann <sh at sourcecode.de> Fri, 16 Sep 2005 19:59:06 +0200
+
+amarok (1.3.0-1) unstable; urgency=low
+
+ * New upstream release packaged (closes: #323249). Bugs reported in the
+ Debian BTS fixed with in this version:
+
+ + does not display advertisements in lyrics. (Closes: #321499)
+ + pre-amp in the equalizer works with XINE engine too. (Closes: #283750)
+ + includes PartyMode. (Closes: #293293)
+ + includes equalizer presets. (Closes: #283761)
+ + builds fine with GCC 4.0. (Closes: #314779)
+
+ * Updated Build-Dependencies:
+
+ + automake1.6 to automake1.9.
+ + libmysqlclient12-dev to libmysqlclient14-dev.
+ + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev
+ in order to allow an early upload in the middle of the KDE transition.
+
+ * Adjustments to the build-system:
+
+ + do not require TagLib 1.4.0 since it's not in Debian yet (#323280).
+ + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the
+ brilliant idea to define a struct/class named "NET".
+
+ * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4
+ breakage does not affect us anymore. (Closes: #318000)
+
+ * Update Standards-Version to 3.6.2 (no changes required).
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Sat, 03 Sep 2005 01:42:56 +0200
+
+amarok (1.2.4-1) unstable; urgency=low
+
+ * The "following Debian Policy is cool, except when it's not" release.
+
+ * New upstream bugfix release:
+
+ + amaroK now correctly displays the name of the first available engine,
+ instead of an empty line. (Closes: #307949)
+
+ * The KDE Session Manager can now restore amaroK on login (closes: #302852,
+ #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the
+ session manager to restore an application the binary must be in the $PATH.
+
+ * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not
+ in /usr/bin.
+
+ * Include small patch to fix upstream bug 103510 ("systray icon continues
+ 'playing' after songs end, if 'clear list' was hit while playing").
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Mon, 06 Jun 2005 00:08:28 +0200
+
+amarok (2:1.2.4-0ubuntu4) breezy; urgency=low
+
+ * Rebuild for the xorg -> mesa GL/GLU transition.
+
+ -- Adam Conrad <adconrad at ubuntu.com> Sun, 21 Aug 2005 19:34:41 +1000
+
+amarok (2:1.2.4-0ubuntu3) breezy; urgency=low
+
+ * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 13 Jul 2005 18:19:28 +0000
+
+amarok (2:1.2.4-0ubuntu2) breezy; urgency=low
+
+ * Default to GStreamer plugin
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 6 Jul 2005 15:30:52 +0000
+
+amarok (2:1.2.4-0ubuntu1) breezy; urgency=low
+
+ * New upstream release
+ * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors
+
+ -- Jonathan Riddell <jr at jriddell.org> Fri, 3 Jun 2005 17:22:10 +0000
+
+amarok (1.2.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ * This version fixes an important memory leak in the GStreamer engine that
+ happened when a radio stream stalled. (Closes: #299931)
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Tue, 29 Mar 2005 01:43:28 +0200
+
+amarok (2:1.2.3-1ubuntu4) hoary; urgency=low
+
+ * Revert back to amarok-arts on request of mdz
+
+ -- Chris Halls <chris.halls at credativ.co.uk> Wed, 6 Apr 2005 09:33:35 +0100
+
+amarok (2:1.2.3-1ubuntu3) hoary; urgency=low
+
+ * Switch default engine to amarok-xine, which is better supported
+ upstream and is less buggy (Hoary: #8429, #8255)
+
+ -- Chris Halls <chris.halls at credativ.co.uk> Mon, 4 Apr 2005 20:01:48 +0100
+
+amarok (2:1.2.3-1ubuntu2) hoary; urgency=low
+
+ * Add build-depend on libtool.
+ * Remove automake1.6 patch
+
+ -- Jonathan Riddell <jr at jriddell.org> Wed, 30 Mar 2005 14:35:20 +0100
+
+amarok (2:1.2.3-1ubuntu1) hoary; urgency=low
+
+ * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org> Wed, 30 Mar 2005 04:25:27 +0000
+
+amarok (1.2.2-1) kalyxo-unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ * Added a menu file, plus XPM icons.
+
+ * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly
+ smaller now, since upstream uses bz2). Added bzip2 to Build-Depends.
+
+ * Build-depend on automake1.6 and libtool, and regenerate configure and
+ Makefiles.in at build-time.
+
+ * Use the kde.mk class maintained by the Debian KDE Maintainers, instead
+ of the one shipped with cdbs.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Thu, 17 Mar 2005 19:38:34 +0100
+
+amarok (1.2.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ * Include patch from CVS to make amaroK bind listening TCP connections to
+ the local interface only. Related to Bug#297693, but not the same.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Fri, 04 Mar 2005 14:54:34 +0100
+
+amarok (1.2.0-1) unstable; urgency=low
+
+ * New upstream release packaged (closes: #296139). Lots of improvements and
+ new functionality, see the changelog or http://amarok.kde.org for details.
+ Bugs reported in the Debian BTS fixed with in this version:
+
+ + the search text input element is now cleared when the user writes
+ something there. (Closes: #278359)
+
+ + analyzers work with the XINE engine. (Closes: #287091)
+
+ * amaroK's collection can be now stored in a MySQL database:
+
+ + Build-Depend on libmysqlclient12-dev
+
+ + Pass --enable-mysql to configure.
+
+ * amaroK now includes a sidebar plugin for Konqueror:
+
+ + debian/amarok.install:
+ - add files for the konqueror sidebar.
+
+ + debian/control:
+ - added kdebase-dev as Build-Dependency.
+
+ + debian/rules:
+ - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
+ amarok doesn't end up depending on konqueror. (The plugin will be
+ ignored in systems without konqueror installed.)
+
+ * Other changes:
+
+ + amaroK now ships several scripts to enhance it. These are written in
+ Python and Ruby, so add those as suggested packages. Added note to
+ README.Debian about this, too.
+
+ + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2.
+
+ + added www-browser as an alternative for the konqueror suggests, since
+ upstream fixed the code so that the configured browser is used.
+
+ + renamed debian/README to debian/README.Debian, so that it gets
+ installed. D'oh!
+
+ + debian/control:
+ - remove Build-Dependency on libkjsembed-dev, no longer needed.
+
+ + debian/amarok.install:
+ - install amarok.profile.xml into /usr/share/apps/profiles.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Wed, 23 Feb 2005 03:03:37 +0100
+
+amarok (1.1.1-2) unstable; urgency=high
+
+ * Upload to get rid of the dependency on libflac4, which is not longer in
+ the archive (closes: #289344). Urgency set to high as other packages with
+ RC bug fixes can't enter testing because of the libflac6 transition not
+ being ready.
+
+ + Relibtoolized the package, so that binaries won't link against not
+ needed libraries. Introduced disable_no_undefined.patch, many thanks to
+ Daniel Schepler for his insight with this (and for providing the patch).
+ [This has reduced the number of NEEDED libraries from 45 to 18, libflac
+ being among them.]
+
+ + debian/control:
+ - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
+
+ * Some new versions of libraries have become available in Debian since the
+ last upload:
+
+ + Taglib 1.3 is now in the archive:
+ - removed debian/patches/taglib-1.2-suffices.patch.
+ - update Build-Depends to libtag1-dev (>> 1.3.1).
+
+ + SQLite 3 is now in the archive:
+ - changed Build-Depends on libsqlite0-dev to libsqlite3-dev.
+ - pass --without-included-sqlite to ./configure.
+ - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to
+ update this check in the 1.1 series. [sqlite3_in_configure.in.patch]
+
+ * New package relationships:
+
+ + amarok now recommends kdemultimedia-kio-plugins, which is needed to play
+ audio CDs.
+
+ + amarok now suggests konqueror, since it's called in the MusicBrainz
+ dialog and some other places. (Closes: #282523)
+
+ * Created a README.Debian files with the following:
+
+ + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped
+ in /usr/lib/amarok instead of /usr/bin, differing from upstream.
+
+ + Describe a fix for the 'Socket-path is not a link or a directory' error.
+
+ + Explicitly mention what is needed to play audio CDs in amarok.
+
+ * Other changes:
+
+ + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make
+ the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in
+ admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch]
+
+ + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since
+ those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch]
+
+ + debian/amarok.1:
+ - correct "hyphen vs. minus sign" usage.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Fri, 14 Jan 2005 01:54:47 +0100
+
+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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at mornfall.homeip.net> Sun, 11 Apr 2004 17:05:00 +0200
Added: people/jriddell/amarok/debian/compat
===================================================================
--- people/jriddell/amarok/debian/compat 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/compat 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1 @@
+4
Added: people/jriddell/amarok/debian/control
===================================================================
--- people/jriddell/amarok/debian/control 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/control 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,79 @@
+Source: amarok
+Section: kde
+Priority: optional
+Maintainer: Adeodato Simó <dato at the-barrel.org>
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.4.2), kdemultimedia-dev (>= 4:3.4.2), kdebase-dev (>= 4:3.4.2), libmysqlclient15-dev, libpq-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev
+Standards-Version: 3.6.2
+
+Package: amarok
+Architecture: any
+Depends: amarok-xine | amarok-engine, ${shlibs:Depends}
+Recommends: kdemultimedia-kio-plugins
+Suggests: konqueror | www-browser, python, ruby, python-qt3, libqt0-ruby1.8
+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).
+
+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-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).
+
+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.
Added: people/jriddell/amarok/debian/copyright
===================================================================
--- people/jriddell/amarok/debian/copyright 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/copyright 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,39 @@
+This package was debianized by Peter Rockai (mornfall)
+<mornfall at mornfall.homeip.net> on
+Sun, 11 Apr 2004 17:06:00 +0200.
+
+Adeodato Simó <asp16 at 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 at chris.de>
+ Frederik Holljen <fh at ez.no>
+ Mark Kretschmann <markey at web.de>
+ Max Howell <max.howell at methylblue.com>
+ Mike Diehl <madpenguin8 at yahoo.com>
+ Pierpaolo Di Panfilo <pippo_dp at libero.it>
+ Roman Becker <roman at formmorf.de>
+ Seb Ruiz <me at sebruiz.net>
+ Stanislav Karchebny <berk at inbox.ru>
+
+Copyright:
+(c) 2002-2003, Mark Kretschmann
+(c) 2003-2005, The amaroK Development Squad
+
+ This program 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 program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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/jriddell/amarok/debian/icons/amarok-16.xpm
===================================================================
--- people/jriddell/amarok/debian/icons/amarok-16.xpm 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/icons/amarok-16.xpm 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,210 @@
+/* XPM */
+static char *amarok-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 188 2",
+" c black",
+". c #010203",
+"X c #010304",
+"o c #030405",
+"O c #030406",
+"+ c #05070A",
+"@ c #03080C",
+"# c #05090D",
+"$ c #04090F",
+"% c #050A10",
+"& c #070F17",
+"* c #071019",
+"= c #0A1521",
+"- c #0B1825",
+"; c #0D1824",
+": c #0D1926",
+"> c #0F1A26",
+", c #0F1E2C",
+"< c #0E1F30",
+"1 c #101D2A",
+"2 c #0F2133",
+"3 c #102030",
+"4 c #132436",
+"5 c #132639",
+"6 c #142638",
+"7 c #17293B",
+"8 c #14283C",
+"9 c #152A40",
+"0 c #193047",
+"q c #193149",
+"w c #19324B",
+"e c #203A55",
+"r c #223D59",
+"t c #26415E",
+"y c #234562",
+"u c #22456C",
+"i c #23486F",
+"p c #26486E",
+"a c #284360",
+"s c #294663",
+"d c #244A71",
+"f c #264F7A",
+"g c #294A70",
+"h c #2A4B71",
+"j c #2D4D73",
+"k c #29537B",
+"l c #2D5178",
+"z c #304F74",
+"x c #35506D",
+"c c #325176",
+"v c #325277",
+"b c #335377",
+"n c #355377",
+"m c #365575",
+"M c #37567A",
+"N c #32597F",
+"B c #33587E",
+"V c #375A7F",
+"C c #385472",
+"Z c #395572",
+"A c #3A5675",
+"S c #38567A",
+"D c #3B5876",
+"F c #3A597A",
+"G c #3B587A",
+"H c #3B5A7B",
+"J c #3B587C",
+"K c #405C7F",
+"L c #445E7F",
+"P c #46607E",
+"I c #2B5781",
+"U c #385C82",
+"Y c #376088",
+"T c #37628A",
+"R c #3A688F",
+"E c #3E6A90",
+"W c #3F6B92",
+"Q c #415D80",
+"! c #435E81",
+"~ c #445F80",
+"^ c #445F82",
+"/ c #466686",
+"( c #476687",
+") c #4A6486",
+"_ c #4E6989",
+"` c #4F6E8F",
+"' c #42769E",
+"] c #46769D",
+"[ c #50698A",
+"{ c #506A89",
+"} c #516A89",
+"| c #506F8F",
+" . c #546D8C",
+".. c #556E8E",
+"X. c #5B7088",
+"o. c #5B718A",
+"O. c #587591",
+"+. c #5B7491",
+"@. c #5E7B9A",
+"#. c #487BA2",
+"$. c #6F7D8C",
+"%. c #607790",
+"&. c #637B97",
+"*. c #627E9B",
+"=. c #6B7D90",
+"-. c #4980A8",
+";. c #4A83AA",
+":. c #5491B8",
+">. c #5693B9",
+",. c #5E99BE",
+"<. c #658DAC",
+"1. c #6A87A0",
+"2. c #6A87A4",
+"3. c #6D89A7",
+"4. c #758BA2",
+"5. c #758FA9",
+"6. c #7E8FA1",
+"7. c #7F93A7",
+"8. c #7997AC",
+"9. c #63A5CA",
+"0. c #6CA7CA",
+"q. c #6CA8CB",
+"w. c #8B949E",
+"e. c #8093A7",
+"r. c #8594A4",
+"t. c #8395A8",
+"y. c #8D99A6",
+"u. c #8F9DAB",
+"i. c #93A0AD",
+"p. c #9AA0A8",
+"a. c #9EA7B1",
+"s. c #A5A6A7",
+"d. c #A3ACB7",
+"f. c #A9AFB7",
+"g. c #A5B2BF",
+"h. c #B0B1B2",
+"j. c #B2B2B2",
+"k. c gray70",
+"l. c #B1B3B6",
+"z. c #B4B5B6",
+"x. c #B6B6B6",
+"c. c #BBBBBB",
+"v. c #B8BBBE",
+"b. c #BCBCBC",
+"n. c #BDBEBF",
+"m. c gray75",
+"M. c #A8B8C9",
+"N. c #B9BDC2",
+"B. c #BABEC3",
+"V. c #93C1D9",
+"C. c #9BC7DD",
+"Z. c #BFC5CB",
+"A. c #B9C4D0",
+"S. c #C1C1C1",
+"D. c #C3C3C3",
+"F. c #C6C6C6",
+"G. c gray78",
+"H. c #C5C8CB",
+"J. c gray79",
+"K. c #CACACA",
+"L. c #CBCBCB",
+"P. c gray80",
+"I. c #CDCDCD",
+"U. c #CECECE",
+"Y. c gray81",
+"T. c #C1C8D0",
+"R. c #D0D0D0",
+"E. c gray82",
+"W. c #D1D1D2",
+"Q. c #D2D2D2",
+"!. c LightGray",
+"~. c gray83",
+"^. c #D5D5D5",
+"/. c #D7D7D7",
+"(. c #DADADA",
+"). c gray86",
+"_. c gainsboro",
+"`. c gray87",
+"'. c #CFD8E1",
+"]. c #D0D9E1",
+"[. c #E4E4E4",
+"{. c gray90",
+"}. c gray91",
+"|. c gray92",
+" X c #EAEDF1",
+".X c gray94",
+"XX c gray97",
+"oX c None",
+/* pixels */
+"oXoXoXoXX 6 a D Z r 1 oXoXoXoX",
+"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX",
+"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX",
+"oX< 7.K._.(.(.~.Q.P.f.y.c. at .% oX",
+"X ` b._.(./.~.~.Q.r. .L b.v.s ",
+"4 u.L./.~.~.Q.H.+.! .$.z.G.5.# ",
+"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ",
+"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ",
+"x j.d._ h b _ J K ~ ! w.D.~.T.8 ",
+"e X.j S h p c M J c p.).{.{.M.: ",
+"> 4.D u u l N U J H R..X.X|.3.O ",
+" C =.d I T E E T O.`.XXXX].w ",
+"oX& f k E ] -.;.#.1.[.XX X/ oX",
+"oXoX= I ' >.q.9.,.8.{.]./ @ oX",
+"oXoXoX# y :.V.C.0.<.2.w X oXoX",
+"oXoXoXoX + , 7 4 ; O oXoXoXoX"
+};
Added: people/jriddell/amarok/debian/icons/amarok.xpm
===================================================================
--- people/jriddell/amarok/debian/icons/amarok.xpm 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/icons/amarok.xpm 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,220 @@
+/* XPM */
+static char *amarok[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 182 2",
+" c #000000",
+". c #020508",
+"X c #03090E",
+"o c #0E0E0E",
+"O c #050A10",
+"+ c #09131E",
+"@ c #101112",
+"# c #14191F",
+"$ c #0A1622",
+"% c #0B1926",
+"& c #0D1C2C",
+"* c #0E1F30",
+"= c #161E26",
+"- c #0F2032",
+"; c #18222D",
+": c #102336",
+"> c #12273C",
+", c #1A2632",
+"< c #1C2B3B",
+"1 c #142C44",
+"2 c #162F48",
+"3 c #16304A",
+"4 c #18324E",
+"5 c #183450",
+"6 c #1B3A5A",
+"7 c #20344A",
+"8 c #223A52",
+"9 c #1E4064",
+"0 c #22456B",
+"q c #23486E",
+"w c #28496F",
+"e c #244A72",
+"r c #244D78",
+"t c #2B4C72",
+"y c #26517E",
+"u c #2C5077",
+"i c #2B537B",
+"p c #325175",
+"a c #355479",
+"s c #33587E",
+"d c #395575",
+"f c #38567A",
+"g c #3B597C",
+"h c #405C7D",
+"j c #49627D",
+"k c #52677E",
+"l c #275280",
+"z c #285685",
+"x c #295788",
+"c c #2D5982",
+"v c #2A598A",
+"b c #2C5D91",
+"n c #355C83",
+"m c #395E83",
+"M c #2E6094",
+"N c #336189",
+"B c #3A658C",
+"V c #336395",
+"C c #356892",
+"Z c #386798",
+"A c #3C6C93",
+"S c #3C6A9A",
+"D c #3D729A",
+"F c #425D80",
+"G c #456083",
+"H c #41678D",
+"J c #496485",
+"K c #4C6688",
+"L c #4F6889",
+"P c #466E93",
+"I c #426E9B",
+"U c #417096",
+"Y c #42739B",
+"T c #47789F",
+"R c #4B749C",
+"E c #506782",
+"W c #536A84",
+"Q c #536C8B",
+"! c #586C82",
+"~ c #5D7084",
+"^ c #5D748D",
+"/ c #51769D",
+"( c #55799E",
+") c #5A7190",
+"_ c #447AA1",
+"` c #457CA8",
+"' c #4F78A2",
+"] c #5C7EA1",
+"[ c #627B96",
+"{ c #6A7F96",
+"} c #4681AB",
+"| c #4984AB",
+" . c #4E8BB2",
+".. c #5082A7",
+"X. c #5084AA",
+"o. c #5E80A4",
+"O. c #5B81A9",
+"+. c #548CB2",
+"@. c #5390B6",
+"#. c #5594BD",
+"$. c #5B94BC",
+"%. c #5E99BE",
+"&. c #6C8197",
+"*. c #69809B",
+"=. c #758699",
+"-. c #778A9D",
+";. c #7C8691",
+":. c #798A9D",
+">. c #6080A2",
+",. c #6A86A3",
+"<. c #6E8CAB",
+"1. c #608FB2",
+"2. c #7389A3",
+"3. c #7B91A6",
+"4. c #7B9AB9",
+"5. c #579AC1",
+"6. c #5B9EC5",
+"7. c #669EC2",
+"8. c #68A8CC",
+"9. c #6AACD0",
+"0. c #72ABCD",
+"q. c #78AFCE",
+"w. c #71B0D2",
+"e. c #7BB4D4",
+"r. c #858F9B",
+"t. c #87909A",
+"y. c #8D949B",
+"u. c #94989C",
+"i. c #9D9D9D",
+"p. c #8493A3",
+"a. c #8395A8",
+"s. c #8798A9",
+"d. c #859FB9",
+"f. c #9199A3",
+"g. c #8EA2B7",
+"h. c #8CA5BF",
+"j. c #96A2AB",
+"k. c #9BA4AD",
+"l. c #9DA9B5",
+"z. c #A3A3A3",
+"x. c #A6A9AC",
+"c. c #ACACAC",
+"v. c #A3ABB2",
+"b. c #A4AEB8",
+"n. c #AAAEB1",
+"m. c #ADB0B3",
+"M. c #ADB4BB",
+"N. c #B3B3B3",
+"B. c #B0B7BE",
+"V. c #B6B8B9",
+"C. c #BBBBBB",
+"Z. c #8FA7C1",
+"A. c #87B6D1",
+"S. c #85BBD7",
+"D. c #A2B1C1",
+"F. c #AFBBC7",
+"G. c #ADBAC8",
+"H. c #B2BCC7",
+"J. c #B0BCCA",
+"K. c #B8BDC3",
+"L. c #93C2DA",
+"P. c #9EC9DE",
+"I. c #BFC3C7",
+"U. c #B0C1D3",
+"Y. c #AFD1E1",
+"T. c #B4D6E4",
+"R. c #C3C3C4",
+"E. c #C1C4C8",
+"W. c #CCCCCC",
+"Q. c #C1CEDC",
+"!. c #CFD4D9",
+"~. c #D3D3D3",
+"^. c #D6DADE",
+"/. c #DBDBDB",
+"(. c #DAE0E6",
+"). c #E2E3E3",
+"_. c #E2E5E8",
+"`. c #ECECEC",
+"'. c #EAEEF1",
+"]. c #F4F4F4",
+"[. c #FBFBFB",
+"{. c None",
+/* pixels */
+"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 * {.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r & {.{.{.{.{.{.{.",
+"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 . {.{.{.{.{.",
+"{.{.{.{. 3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X {.{.{.{.",
+"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y . {.{.{.",
+"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q {.{.",
+"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1 {.{.",
+"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X {.",
+"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5 {.",
+"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v . ",
+"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I % ",
+"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ",
+", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ",
+"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ",
+"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ",
+"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ",
+", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q ",
+"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6 ",
+"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ",
+"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ",
+"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9 . ",
+"{. r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $ {.",
+"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9 {.",
+"{.{. 6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X {.{.",
+"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V % {.{.",
+"{.{.{. . e c N A D @. at .8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.",
+"{.{.{.{. . 9 M D X. at .6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.",
+"{.{.{.{.{. > N } #.9.S.L.L.S.w.0. at .c.~.h.S 9 X {.{.{.{.{.",
+"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{."
+};
Added: people/jriddell/amarok/debian/overrides/amarok-arts
===================================================================
--- people/jriddell/amarok/debian/overrides/amarok-arts 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/overrides/amarok-arts 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1 @@
+amarok-arts: no-shlibs-control-file usr/lib/libamarokarts.so
Added: people/jriddell/amarok/debian/patches/am_maintainer_mode.patch
===================================================================
--- people/jriddell/amarok/debian/patches/am_maintainer_mode.patch 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/am_maintainer_mode.patch 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
Added: people/jriddell/amarok/debian/patches/disable-final.diff
===================================================================
--- people/jriddell/amarok/debian/patches/disable-final.diff 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/disable-final.diff 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,10 @@
+--- amarok-1.3/amarok/src/Makefile.am~ 2005-08-15 23:28:19.000000000 +0200
++++ amarok-1.3/amarok/src/Makefile.am 2005-08-15 23:29:27.000000000 +0200
+@@ -8,6 +8,7 @@
+ KONQSIDEBAR_SUBDIR = konquisidebar
+ endif
+
++KDE_OPTIONS = nofinal
+
+ bin_PROGRAMS = amarokapp
+
Added: people/jriddell/amarok/debian/patches/disable_no_undefined.patch
===================================================================
--- people/jriddell/amarok/debian/patches/disable_no_undefined.patch 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/disable_no_undefined.patch 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1665,15 +1665,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
Added: people/jriddell/amarok/debian/patches/gmo_files_at_build_time.patch
===================================================================
--- people/jriddell/amarok/debian/patches/gmo_files_at_build_time.patch 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/gmo_files_at_build_time.patch 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,11 @@
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -196,7 +196,7 @@
+ ###
+ ### Then make messages
+ ###
+-if test -d po; then
++if test -d po && false; then
+ LIST=`find ./po -name "*.po"`
+ for i in $LIST; do
+ file2=`echo $i | sed -e "s#\.po#\.gmo#"`
Added: people/jriddell/amarok/debian/patches/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/amarok/debian/patches/kubuntu_01_kdepot.diff 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/kubuntu_01_kdepot.diff 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
+@@ -554,10 +556,10 @@
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+- if ! test -f $kdepotpath; then
+- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+- fi
++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++# if ! test -f $kdepotpath; then
++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++# fi
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
Added: people/jriddell/amarok/debian/patches/kubuntu_02_read_kubuntu_config.diff
===================================================================
--- people/jriddell/amarok/debian/patches/kubuntu_02_read_kubuntu_config.diff 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/kubuntu_02_read_kubuntu_config.diff 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,17 @@
+--- amarok-1.3.7/amarok/src/loader/loader.cpp~ 2005-12-06 00:09:25.000000000 +0000
++++ amarok-1.3.7/amarok/src/loader/loader.cpp 2005-12-15 20:12:27.000000000 +0000
+@@ -222,6 +222,14 @@
+ return false;
+ }
+
++ QFile file2( "/usr/share/kubuntu-default-settings/kde-profile/default/share/config/amarokrc" );
++ if ( file2.open( IO_ReadOnly ) ) {
++ QString line;
++ while( file2.readLine( line, 2000 ) != -1 )
++ if ( line.contains( "Show Splashscreen" ) && line.contains( "false" ) )
++ return false;
++ }
++
+ //if we fail to open it, just show the splash
+
+ return true;
Added: people/jriddell/amarok/debian/patches/no_libadd_in_convenience_libs.diff
===================================================================
--- people/jriddell/amarok/debian/patches/no_libadd_in_convenience_libs.diff 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/no_libadd_in_convenience_libs.diff 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,11 @@
+--- a/amarok/src/statusbar/Makefile.am
++++ b/amarok/src/statusbar/Makefile.am
+@@ -9,8 +9,6 @@
+ -I$(top_srcdir)/amarok/src/engine \
+ -I$(top_builddir)/amarok/src/ \
+ $(all_includes)
+-
+-libstatusbar_la_LIBADD = $(LIB_QT)
+
+ libstatusbar_la_SOURCES = \
+ statusBarBase.cpp \
Added: people/jriddell/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/jriddell/amarok/debian/patches/some-binaries-in-usr-lib.patch 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/some-binaries-in-usr-lib.patch 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,90 @@
+--- a/amarok/src/loader/loader.cpp
++++ b/amarok/src/loader/loader.cpp
+@@ -66,7 +66,7 @@
+ // this argument cannot be passed to the running amarokapp
+ // or KCmdLineArgs would exit the application
+
+- QProcess proc( QString("amarokapp") );
++ QProcess proc( QString("/usr/lib/amarok/amarokapp") );
+ proc.setCommunication( 0 ); //show everything
+ proc.addArgument( arg );
+ proc.start();
+@@ -141,7 +141,7 @@
+ if( !QApplication::isSessionRestored() && isSplashEnabled() )
+ m_splash = new Splash;
+
+- args.prepend( "amarokapp" );
++ args.prepend( "/usr/lib/amarok/amarokapp" );
+
+ m_proc = new QProcess( args, this );
+ m_proc->setCommunication( QProcess::Stdout );
+--- a/amarok/src/socketserver.cpp
++++ b/amarok/src/socketserver.cpp
+@@ -193,23 +193,23 @@
+
+ //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', QString::fromLocal8Bit( str ) );
+
+ for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
+- new Item( this, "amarok_xmmswrapper2", *it, "xmms" );
++ new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it, "xmms" );
+
+- vis = popen( "amarok_libvisual --list", "r" );
++ vis = popen( "/usr/lib/amarok/amarok_libvisual --list", "r" );
+ str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+ pclose( vis );
+
+ entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) );
+
+ for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
+- new Item( this, "amarok_libvisual", *it, "libvisual" );
++ new Item( this, "/usr/lib/amarok/amarok_libvisual", *it, "libvisual" );
+
+ resize( sizeHint() + QSize(20,0) );
+ // Center the widget on screen
+--- a/amarok/src/main.cpp
++++ b/amarok/src/main.cpp
+@@ -91,6 +91,8 @@
+ aboutData.addCredit( "Sven Krohlas", I18N_NOOP( "roKymoter (sven423)" ), "sven at asbest-online.de" );
+ aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode at gmx.net" );
+
++ argv[0] = qstrdup( "amarok" );
++
+ KApplication::disableAutoDcopRegistration();
+
+ App::initCliArgs( argc, argv );
+--- a/amarok/src/amarokcore/crashhandler.cpp
++++ b/amarok/src/amarokcore/crashhandler.cpp
+@@ -134,7 +134,7 @@
+ QCString gdb;
+ gdb = "gdb --nw -n --batch -x ";
+ gdb += temp.name().latin1();
+- gdb += " amarokapp ";
++ gdb += " /usr/lib/amarok/amarokapp ";
+ gdb += QCString().setNum( ::getppid() );
+
+ QString bt = runCommand( gdb );
+@@ -147,7 +147,7 @@
+
+ /// analyze usefulness
+ bool useful = true;
+- const QString fileCommandOutput = runCommand( "file `which amarokapp`" );
++ const QString fileCommandOutput = runCommand( "file /usr/lib/amarok/amarokapp" );
+
+ if( fileCommandOutput.find( "not stripped", false ) == -1 )
+ subject += "[___stripped]"; //same length as below
+@@ -182,7 +182,7 @@
+ //TODO pass the CXXFLAGS used with the email
+
+ if( useful ) {
+- body += "==== file `which amarokapp` =======\n";
++ body += "==== file /usr/lib/amarok/amarokapp =======\n";
+ body += fileCommandOutput + "\n\n";
+ body += "==== (gdb) bt =====================\n";
+ body += bt + "\n\n";
Added: people/jriddell/amarok/debian/patches/taglib-1.3.1-suffices.diff
===================================================================
--- people/jriddell/amarok/debian/patches/taglib-1.3.1-suffices.diff 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/patches/taglib-1.3.1-suffices.diff 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,11 @@
+--- amarok-1.3/amarok/configure.in.in~ 2005-08-15 22:52:47.000000000 +0200
++++ amarok-1.3/amarok/configure.in.in 2005-08-15 22:54:11.000000000 +0200
+@@ -37,7 +37,7 @@
+ # BEGIN TAGLIB CHECK
+ ###############################################################################
+
+-TAGLIB_REQ_VERSION="1.4.0";
++TAGLIB_REQ_VERSION="1.3.1";
+ AC_DEFUN([VERSION_TO_NUMBER], [`$1 | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1* 1000 + [$]2) * 1000 + [$]3;}'`])
+
+ AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, no)
Added: people/jriddell/amarok/debian/rules
===================================================================
--- people/jriddell/amarok/debian/rules 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/rules 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+
+DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tar.bz2) .tar.bz2)
+
+### CDBS INCLUDES
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+### VARIABLES
+DEB_KDE_CVS_MAKE := yes
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -n
+DEB_INSTALL_DIRS_amarok := usr/lib/amarok
+DEB_DH_SHLIBDEPS_ARGS := -Xusr/lib/amarok/amarok_xmmswrapper2 \
+ -Xusr/lib/kde3/konqsidebar_universalamarok.so
+
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-postgresql \
+ --enable-mysql
+
+# See debian/TODO
+DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done))
+
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+ export CC=gcc-3.4
+ export CPP=cpp-3.4
+ export CXX=g++-3.4
+endif
+
+###
+
+### Libtool and Automake updates
+post-patches:: debian/stamp-autothings-update
+debian/stamp-autothings-update:
+ cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
+ cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
+ for f in /usr/share/automake-1.9/*; do \
+ if test -f $$f && \
+ test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
+ cp -f $$f $(DEB_SRCDIR)/admin; \
+ fi; \
+ done
+ touch $@
+
+clean::
+ rm -f debian/stamp-autothings-update
+
+### COMMON STUFF
+common-binary-arch::
+ # Use debian/substvars
+ for p in $(DEB_ALL_PACKAGES); do \
+ cat debian/substvars >>debian/$$p.substvars; \
+ done
+
+### POST-INSTALL HACKING
+# 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
+
+ # Check for not installed files
+ dh_install --no-act --list-missing
Property changes on: people/jriddell/amarok/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: people/jriddell/amarok/debian/substvars
===================================================================
--- people/jriddell/amarok/debian/substvars 2006-02-14 11:31:41 UTC (rev 3124)
+++ people/jriddell/amarok/debian/substvars 2006-02-14 14:27:50 UTC (rev 3125)
@@ -0,0 +1,4 @@
+gstreamer:Depends=gstreamer0.8-oss | gstreamer0.8-audiosink, gstreamer0.8-misc, gstreamer0.8-vorbis
+gstreamer:Recommends=gstreamer0.8-flac, gstreamer0.8-audiofile
+gstreamer:Suggests=gstreamer0.8-plugins, gstreamer0.8-mad
+enginePackages=amarok-arts, amarok-gstreamer, amarok-xine
More information about the pkg-kde-commits
mailing list