diff options
Diffstat (limited to 'ubuntu')
35 files changed, 3288 insertions, 38 deletions
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES new file mode 100644 index 000000000..ca324be99 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,14 @@ +debian/install-mp3 /usr/lib/amarok +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services +Depend on amarok-xine | amarok-engine +export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok +install debian/kubuntu-media-amarok and debian/amarok_play_audiocd.desktop in amarok.install +chmod x debian/amarok/usr/bin/kubuntu-media-amarok in debian/rules in section + common-binary-post-install-arch:: +remove amarok-common.lintian, amarok.lintian +make watch file actually work + +#### due to removal of KDE 3 packages #### +remove kdemultimedia-dev, kdebase-dev from Build-Depends +remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends +remove complete amarok-konqsidebar package diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian b/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian new file mode 100644 index 000000000..7dc17fb17 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian @@ -0,0 +1,28 @@ +Amarok packages for Debian +========================== + + A couple of notes which you may find useful: + + - starting with Amarok 1.4, lyrics downloading is implemented in a + separate Ruby script; + + - Last.fm stream support is also implemented with the help of a Ruby + script. + + - 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 Suggests: field of the amarok package. + + 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ó <dato@net.com.org.es> diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-common-trinity.install b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-common-trinity.install new file mode 100644 index 000000000..3b473baa0 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-common-trinity.install @@ -0,0 +1,24 @@ +debian/tmp/opt/trinity/share/apps/amarok/* +debian/tmp/opt/trinity/share/apps/profiles/* +debian/tmp/opt/trinity/share/doc/* +debian/tmp/opt/trinity/share/icons/* +debian/tmp/opt/trinity/share/locale/* +debian/tmp/opt/trinity/share/config.kcfg/amarok.kcfg +debian/tmp/opt/trinity/share/services/amarok_void-engine_plugin.desktop +debian/tmp/opt/trinity/share/services/amarok_generic-mediadevice.desktop +debian/tmp/opt/trinity/share/services/amarok_ifp-mediadevice.desktop +debian/tmp/opt/trinity/share/services/amarok_ipod-mediadevice.desktop +debian/tmp/opt/trinity/share/services/amarok_njb-mediadevice.desktop +debian/tmp/opt/trinity/share/services/amarok_smb-device.desktop +debian/tmp/opt/trinity/share/services/amarok_massstorage-device.desktop +debian/tmp/opt/trinity/share/services/amarok_nfs-device.desktop +debian/tmp/opt/trinity/share/services/amarok_daap-mediadevice.desktop + +#libkarma is not in MAIN yet +#debian/tmp/opt/trinity/share/services/amarok_riokarma-mediadevice.desktop + +debian/tmp/opt/trinity/share/services/amarok_mtp-mediadevice.desktop +debian/tmp/opt/trinity/bin/amarok_proxy.rb +debian/tmp/opt/trinity/bin/amarok_daapserver.rb +debian/tmp/etc/* + diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install new file mode 100644 index 000000000..6b23c8378 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install @@ -0,0 +1,4 @@ +debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop +debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg +debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.so +debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.la diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install new file mode 100644 index 000000000..9a7c007c6 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install @@ -0,0 +1,3 @@ +debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop +debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.la +debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.so diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.install b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.install new file mode 100644 index 000000000..50181a39e --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.install @@ -0,0 +1,48 @@ +debian/tmp/opt/trinity/share/applications/kde/amarok.desktop +debian/tmp/opt/trinity/share/services/amarokitpc.protocol +debian/tmp/opt/trinity/share/services/amaroklastfm.protocol +debian/tmp/opt/trinity/share/services/amarokpcast.protocol +debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop +debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop +debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.la +debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.so +debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.so +debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.so +debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.so +debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.so +debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.la +debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.so +debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.la +debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.so +debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.la +debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.so +debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.so + +#libkarma is not in MAIN yet +#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.la +#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.so + +debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.la +debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.so +debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/ +debian/tmp/opt/trinity/lib/libamarok.so.0 +debian/tmp/opt/trinity/lib/libamarok.so.0.0.0 +debian/tmp/opt/trinity/bin/amarok +debian/tmp/opt/trinity/bin/amarokapp +debian/tmp/opt/trinity/bin/amarok_libvisual +debian/tmp/opt/trinity/bin/amarokcollectionscanner + +debian/icons/* /opt/trinity/share/pixmaps + +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /opt/trinity/share/services +debian/amarok_play_audiocd.desktop /opt/trinity/share/apps/konqueror/servicemenus +debian/kubuntu-media-amarok /opt/trinity/bin +debian/install-mp3 /opt/trinity/lib/amarok diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.manpages b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.manpages new file mode 100644 index 000000000..8094eebb9 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.manpages @@ -0,0 +1,4 @@ +debian/man/amarokapp-trinity.1 +debian/man/amarok-trinity.1 +debian/man/amarokcollectionscanner-trinity.1 +debian/man/amarok_libvisual-trinity.1 diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu new file mode 100644 index 000000000..f78ef6060 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu @@ -0,0 +1,8 @@ +?package(amarok):\ + needs="X11"\ + section="Applications/Sound"\ + hints="KDE"\ + title="Amarok"\ + icon32x32="/usr/share/pixmaps/amarok.xpm"\ + icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + command="/opt/trinity/bin/amarok" diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/ubuntu/maverick/applications/amarok.cmake/debian/amarok_play_audiocd.desktop new file mode 100644 index 000000000..434630b60 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok_play_audiocd.desktop @@ -0,0 +1,46 @@ +[Desktop Entry] +ServiceTypes=media/audiocd +Actions=Play; +Encoding=UTF-8 +X-KDE-Priority=TopLevel + +[Desktop Action Play] +Name=Play Audio CD with amaroK +Name[ar]=قراءة قرص مدمج صوتي بواسطة amaroK +Name[bg]=Възпроизвеждане на аудио CD с amaroK +Name[bn]=ক্যাফিন দিয়ে অডিও সিডি চালাও +Name[br]=Seniñ ur bladenn klevet gant amaroK +Name[ca]=Reprodueix Audio CD amb amaroK +Name[cs]=Pehrát audio CD amaroK +Name[da]=Spil lyd-cd med amaroK +Name[de]=Audio-CD mit amaroK abspielen +Name[el]=Αναπαραγωγή CD ήχου με το amaroK +Name[es]=Reproducir CD de audio con amaroK +Name[et]=Esita audio-CD amaroK'is +Name[fi]=Soita musiikki-cd amaroKssa +Name[fr]=Jouer un CD Audio avec amaroK +Name[ga]=Seinn CD Fuaime le amaroK +Name[gl]=Reproducir o CD de Áudio con amaroK +Name[he]=נגן תקליטור שמע עם amaroK +Name[is]=Spila tónlistardisk með amaroK +Name[it]=Riproduci CD audio con amaroK +Name[ja]=amaroKで音楽CDを再生 +Name[ka]=აუდიო CD-ის დაკვრა amaroK-ით +Name[km]=ចាក់ស៊ីឌីអូឌីយ៉ូជាមួយ amaroK +Name[nb]=Spill lyd-CD med amaroK +Name[nl]=Audio-cd met amaroK afspelen +Name[nn]=Spel lyd-CD med amaroK +Name[pa]=ਕੈਫੀਨ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ +Name[pl]=Odtwarzaj audio CD w amaroK +Name[pt]=Tocar o CD de Áudio com o amaroK +Name[pt_BR]=Reproduzir o CD de Áudio com o amaroK +Name[sr]=Пустио аудио CD amaroK-ом +Name[sr@Latn]=Pustio audio CD amaroK-om +Name[sv]=Spela ljud-cd med amaroK +Name[tr]=amaroK ile Ses CD'si Çal +Name[uk]=Програти аудіо-КД з amaroK +Name[xx]=xxPlay Audio CD with amaroKxx +Name[zh_CN]=用 amaroK 播放音频 CD +Name[zh_TW]=使用 amaroK 播放音樂 CD +Icon=amarok +Exec=bash kubuntu-media-amarok %u diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# 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., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..888f4be38 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,98 @@ +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_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@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., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +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}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter 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/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/team-members b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog new file mode 100644 index 000000000..7dc833d40 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog @@ -0,0 +1,1586 @@ +amarok-trinity (2:1.4.10-1ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 + +amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low + + * Jaunty rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 28 April 2009 13:23:00 -0600 + +amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low + + * Moved KDE3 to /opt/trinity + * Integrated properly with KDE4.2+ + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 03 March 2009 20:08:00 -0600 + +amarok-trinity (2:1.4.10-0ubuntu2) intrepid; urgency=low + + * Fixed Debian MP3 autoinstaller + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 08 Dec 2008 15:59:00 -0600 + +amarok-trinity (2:1.4.10-0ubuntu1) intrepid; urgency=low + + * Added -trinity prefix + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 02 Dec 2008 22:55:00 -0600 + +amarok (2:1.4.10-0ubuntu3) intrepid; urgency=low + + * Add kubuntu_12_eject_command.diff, change eject command to + umount, we no longer have kdeeject + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 13 Oct 2008 22:16:22 +0100 + +amarok (2:1.4.10-0ubuntu2) intrepid; urgency=low + + * Update install-mp3 to use install-package + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 08 Sep 2008 14:30:40 +0100 + +amarok (2:1.4.10-0ubuntu1) intrepid; urgency=low + + * New upstream release + * Add kubuntu_11_fix_libmtp-0.3.0-API.diff + + -- Harald Sitter <apachelogger@ubuntu.com> Thu, 14 Aug 2008 18:04:13 +0200 + +amarok (2:1.4.9.1-2ubuntu3) intrepid; urgency=low + + * Add moodbar to the feature list + * Remove the amarok-engine virtual package, see debian version 1.4.8-2 for + reasoning + * amarok-common conflicts with amarok packages older than -2ubuntu1, but + doesn't replace them (LP: #244628) + + -- Harald Sitter <apachelogger@ubuntu.com> Mon, 30 Jun 2008 19:19:04 +0200 + +amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low + + * Add manpages - unbreak build + + -- Harald Sitter <apachelogger@ubuntu.com> Fri, 27 Jun 2008 15:34:42 +0200 + +amarok (2:1.4.9.1-2ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Harald Sitter <apachelogger@ubuntu.com> Wed, 25 Jun 2008 21:16:38 +0200 + +amarok (1.4.9.1-2) unstable; urgency=medium + + * Add 15_temptables_more_indices.diff patch which creates more indices for + some temporary tables that are used extensively while building collection + database. Apparently, SQLite 3.5.x is slower than 3.4.x when doing + matches on unindexed temporary table fields. This should solve (or improve + situation significantly) major performance problems with SQLite 3.5.x + (Closes: #479068). Urgency medium because this problem affects many + lenny and sid Amarok users having rather large (15k+ songs) collections. + + -- Modestas Vainius <modestas@vainius.eu> Sun, 11 May 2008 04:07:01 +0300 + +amarok (1.4.9.1-1) unstable; urgency=low + + * New upstream bugfix release: + - The last.fm dialog did not always properly disable options when the + username was not entered. + - Fix Amazon Cover fetching by using their new web service api. + (Closes: #474186) + - Don't insert items into Dynamic Mode that don't exist. + - If unavailable tracks are in the Playlist and random mode is on, don't + - stop those tracks if selected; continue with available tracks. + * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig + tarball thing. The previous way made patch testing and debugging more + painful unnecessarily. + * Resynchronize patches: + - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets. + - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets. + * Improve debian/rules stamp-automake and clean targets a bit not to rm + automake generated files uselessly (if they were not regenerated) + + -- Modestas Vainius <modestas@vainius.eu> Fri, 11 Apr 2008 10:12:31 +0300 + +amarok (1.4.8-2) unstable; urgency=low + + * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for + all your hard work! + * Remove amarok-gstreamer.install because there is no gstreamer engine + anymore. + * Remove overrides/amarok-arts. arts engine is no longer available. + * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge + missing functionality (cvs-make/automake) into debian/rules. + * Auto-guess automake /usr/share directory. + * Rework interdependences among amarok and its engines' packages: + - Drop amarok-engine virtual package. Amarok and its engines ABI are not + even compatible between Amarok point releases so virtual package, which, + unfortunately, is versionless by definition, is not practical here. + - Rename engine packages to amarok-engine-$engine. Make them conflict + and replace previous amarok-$engine packages. Also make amarok conflict + with amarok-engine virtual package. All these changes will ensure that + partial upgrades from etch are not allowed (Closes: #432219). + - Make amarok depend on any of its engines of the same binary version + via alternate dependences. Default engine is amarok-engine-xine. Edit + amarok-engine-xine description accordingly. + - Make all amarok engines recommend amarok strictly of the same binary + version. Recommends instead of Depends here breaks circular dependency + (Closes: #368485). + - Downgrade amarok-engines to amarok Suggests. + - Convert amarok-engines package to arch:all because it's a metapackage. + Edit amarok-engines description because it's no longer going to be + installed by default. + - Add amarok-yauap to amarok-engines Suggests. + * New binary packages: + - amarok-common - arch:all package for architecture independent files + split from amarok. It recommends amarok (>= ${source:Version}) to + avoid circular dependency as in case of stricter "Depends" relationship. + - amarok-konqsidebar - split konqsidebar into its own binary package. The + reason for this is that it's incompatible with konqueror (>= 4:4.0.0) + and needs to _conflict_ with it (due to *.desktop files). Add + amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar + Depends. + - amarok-dbg - package with debugging symbols (Closes: #368840). + - amarok-engine-yauap - Yauap Commandline Audio Player engine + (Closes: #445371): + * Add libdbus-qt-1-dev to Build-Depends + * Pass --with-yauap to configure + * Add amarok-yauap.install + * Depend on yauap. + * Add "Homepage" field to debian/control source section, remove homepage + reference from amarok binary package description. + * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just + complicate packaging unnecessarily and make lintian unhappy. + * Ship only README from upstream source in /usr/share/doc/amarok. + * debian/README.Debian: remove a note about installing ruby, because it's + a dependency and gets installed anyway. + * New patches: + - 01_libtool_update.diff - use ltmain.sh and libtool.m4.in from Debian + libtool. This patch is used instead of previous `cp` in debian/rules, + because the patch 02_ below depends on it. + - 02_admin_cleanup.diff - admin/* cleanup patch. + - 97_automake_cleanup.diff - automake cleanup patch to get rid of excess + dependencies and shut dpkg-shlibdeps up. Superseeds previous + 03_no_libadd_in_convenience_libs.diff patch. + - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending + 'rename' request for the playlist item that is about to be deleted. + The patch solves a popular crash. (Closes: #403340). + - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop + calls. It's very unsafe because it might break further dcop calls such + as the one in the debian bug #432752 (Closes: #432752). + - 13_lastfm_crash_434835.diff - resolve lastfm crash which could be + triggered by switching away from lastfm track while it was still + handshaking or buffering (Closes: #434835). Thanks to Raphael for the + excelent instructions how to reproduce the crash. + - 14_ruby_libs_not_scripts.diff - remove #! stanzas from ruby library + files. + * Prepend sequence number to the filenames of existing debian/patches/*. + Edit debian/patches/series accordingly. + * Move Depends/Recommends on ruby, python & friends from amarok to + amarok-common since they scripts have been moved here. + * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package + description accordingly. + * Add DM-Upload-Allowed: yes to debian/control source section. + * s/XS-Vcs/Vcs/ in debian/control. + * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with + recent dpkg-shlibdeps. + * Build-Depend on debhelper (>= 5.0.0) + * Add executable permissions for some amarok scripts to make lintian happy. + * s/.NF/.nf/ in debian/amarok.1 + * Drop DEB_INSTALL_DIRS_amarok from debian/rules. No longer needed. + * Use more accurate method to exclude (-X) amarok engines from being handled + by dh_makeshlibs instead of just DEB_DH_MAKESHLIBS_ARGS_ALL = -n. + * Do not amarok.install /usr/lib/libamarok.so and /usr/lib/libamarok.la. + They are devel-only and, hence, useless in the private library like + libamarok case. + * Install *.lintian files with overrides. + * Add manual pages: amarokapp.1 amarokcollectionscanner.1 amarok_libvisual.1 + * Do not install COPYING files which are present in some script directories. + Also remove useless (according to lintian) MacOS X resource fork file + rubygems/._gem_commands.rb + * Exclude amarok from amarok-engine-* packages dependency lists. + + -- Modestas Vainius <modestas@vainius.eu> Tue, 04 Mar 2008 15:28:46 +0200 + +amarok (1.4.8-1) unstable; urgency=low + + [ Adeodato Simó ] + * Build against libgpod-nogtk-dev. + + * Update Build-Standards to 3.7.3: + + move menu entry to Applications/Sound. + + * Build-depend on automake instead of automake1.9. + + [ Modestas Vainius ] + * Add myself as maintainer with the permission from Adeodato Simó. + * Add Adeodato Simó as uploader. + * debian/control: drop Vcs-Bazaar field. amarok debian packaging is + now hosted at kde-extras svn repo therefore I'm adding appropriate + XS-Vcs-Svn and XS-Vcs-Browser fields. + + * New upstream release (1.4.8) (Closes: #457352). + * Resync patches: + - proxy_lyrics.diff - removed, merged upstream. + - fix_gcc4.3_ftbfs.diff - removed, resolved upstream. + * Drop kdemultimedia-dev from Build-Depends. It's no longer needed. + * debian/rules: use /usr/share/automake-1.10 instead of *-1.9 + because 'automake' package provides version 1.10. + + -- Modestas Vainius <modestas@vainius.eu> Mon, 24 Dec 2007 23:10:02 +0200 + +amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low + + * Added kdebase-kio-plugins as a recommened package + + -- Jonathan Aquilina <eagles051387@gmail.com> Tue, 15 Apr 2008 14:24:23 +0200 + +amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low + + [ Daniel Hahler] + * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff: + Add lastfm recommended radio station (LP: #103227) + * debian/patches/kubuntu_09_audio_mimetypes.diff: + - Add mimetypes audio/flac and audio/ogg (LP: #201291) + + [ Harald Sitter ] + * Unbreak manual media device configuration by enhancing + kubuntu_08_luks_device_detection.diff (LP: #207704) + + -- Harald Sitter <apachelogger@ubuntu.com> Sat, 12 Apr 2008 13:47:12 +0200 + +amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low + + * Upstream patch release + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 10 Apr 2008 23:07:12 +0100 + +amarok (2:1.4.9-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Harald Sitter <apachelogger@ubuntu.com> Wed, 09 Apr 2008 13:09:03 +0200 + +amarok (2:1.4.8-0ubuntu5) hardy; urgency=low + + * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's + media device detection to properly work with kdebase's + LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384) + + -- Harald Sitter <apachelogger@ubuntu.com> Tue, 18 Mar 2008 01:10:01 +0100 + +amarok (2:1.4.8-0ubuntu4) hardy; urgency=low + + * Update install-mp3 to correctly error when something goes wrong + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 13 Mar 2008 13:11:08 +0000 + +amarok (2:1.4.8-0ubuntu3) hardy; urgency=low + + [ Sven Boden ] + * Fix for bug "187406: Amarok install-mp3 fails silently" (LP #187406) + + [ Sarah Hobbs ] + * Sponsored upload. (Closes LP: #187406) + * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) + + -- Sarah Hobbs <hobbsee@ubuntu.com> Wed, 12 Mar 2008 00:50:22 +1100 + +amarok (2:1.4.8-0ubuntu2) hardy; urgency=low + + * Fix install-mp3 installation path (LP: #179624) + + -- Guillaume Martres <smarter3@gmail.com> Mon, 31 Dec 2007 11:50:29 +0100 + +amarok (2:1.4.8-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Removed kubuntu_05_utf8_to_mtp_devices_fix.diff (applied upstream). + * Removed kubuntu_06_fix_amarok_freeze_installing_mp3.diff (applied upstream). + * Removed proxy_lyrics.diff (applied upstream). + * Removed overrides/ and it's content since there is no amarok-arts anymore. + * Removed amarok-gstreamer.install since there is no amarok-gstreamer anymore. + * Changed Standards-Version to 3.7.3. + * Moved "Homepage" from Description stanza to the source section. + + -- Harald Sitter <apachelogger@ubuntu.com> Mon, 17 Dec 2007 16:19:44 +0100 + +amarok (2:1.4.7-2ubuntu5) hardy; urgency=low + + * build without the libkerma-dev build dpendancy also ( realy fixed this + upload ) + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Mon, 10 Dec 2007 01:56:48 -0600 + +amarok (2:1.4.7-2ubuntu4) hardy; urgency=low + + * build with --without-libkarma, as it seems to be default if left blank. + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sat, 08 Dec 2007 09:49:20 -0600 + +amarok (2:1.4.7-2ubuntu3) hardy; urgency=low + + * removed --with-libkarma, libkarma{0,-dev} is not in Main yet. + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Wed, 05 Dec 2007 23:47:20 -0600 + +amarok (2:1.4.7-2ubuntu2) hardy; urgency=low + + * Rebuild for libmtp6 -> libmtp7 transition + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 04 Dec 2007 14:01:22 +0000 + +amarok (2:1.4.7-2ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 03 Dec 2007 20:01:18 +0000 + +amarok (1.4.7-2) UNRELEASED; urgency=low + + * Build against libgpod-nogtk-dev. + + -- Adeodato Simó <dato@net.com.org.es> Sun, 26 Aug 2007 16:16:54 +0200 + +amarok (1.4.7-1) unstable; urgency=low + + * The "Are you breaking up with me?" release. + + -- Adeodato Simó <dato@net.com.org.es> Mon, 20 Aug 2007 11:00:49 +0200 + +amarok (1.4.6-1) unstable; urgency=low + + * New upstream version packaged. + + * Drop magnatune_CVE-2006-6980.diff; a (better) fix was applied upstream. + + -- Adeodato Simó <dato@net.com.org.es> Fri, 22 Jun 2007 22:12:29 +0100 + +amarok (1.4.5-5) unstable; urgency=low + + * Rebuild against libtunepimp 0.5; change Build-Depends from libtunepimp3-dev + to libtunepimp-dev. (Closes: #425884) + + -- Adeodato Simó <dato@net.com.org.es> Fri, 25 May 2007 11:02:17 +0200 + +amarok (1.4.5-4) unstable; urgency=low + + * Upload to unstable. (Closes: #421920) + + * Remove build-dependency on dpkg-dev (the version in stable groks + ${binary:Version}), and drop version requirement on debhelper and + libtag1-dev as well. + + * Drop the changes made to remove circular dependencies. (Reopens: #368485, + closes: #415484, #412464) + + * Add patch to fix FTBFS with gcc-4.3. (Closes: #417684) + + * Use ${binary:Version} instead of ${source:Version}. + + * Add XS-VCS-Bzr field. + + * Add watch file, and adjust download URL on debian/copyright. + + -- Adeodato Simó <dato@net.com.org.es> Fri, 11 May 2007 11:57:31 +0200 + +amarok (1.4.5-3) experimental; urgency=low + + * Add support for devices using MTP, build-dep on libmtp-dev added. + (Closes: #405399) + * Add support for karma devices, build-dep on libkarma-dev added. + (Closes: #400801) + * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell. + (Closes: #410850) + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Mon, 12 Mar 2007 02:38:05 +0100 + +amarok (1.4.5-2) experimental; urgency=low + + * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2). + (Closes: #409985) + * Add patch to add the "Queue Track" functionality to the Amarok DCOP API: + queuemedia.patch. Patch by Isaac Clerencia <isaac@debian.org> + * Add patch to allow amarok get lyrics via http proxy with authentication. + Thanks to Filipe Lautert <filipe@icewall.org>. (Closes: #409568) + * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas + Pakulat for pointing this. (Closes: #409996). + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sat, 10 Feb 2007 00:40:10 +0100 + +amarok (1.4.5-1) experimental; urgency=low + + * New upstream release: + - Remove patches merged by upstream: invoke_browser, sparc-asm, magnatune, + kde134333_negative_length_fix, revert-fix-for-bug-116127. + * The XMMS visualization interface has been removed by upstream: + - Remove xmms-dev build-dep. + - amarok's description updated. + - update amarok.install/rules. + * iPod support temporarily dropped. (It needs libgpod >= 0.4.2, which is not + yet in Debian). + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Fri, 2 Feb 2007 05:15:29 +0100 + +amarok (1.4.4-4) unstable; urgency=high + + * Include final version of the magnatune.patch and really apply it. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sun, 18 Feb 2007 01:17:49 +0100 + +amarok (1.4.4-3) unstable; urgency=high + + * Edited patch magnatune.patch fixing CVE-2006-6980: amarok magnatune + unsafe shell. (Closes: #410850). + The reference to the ruby scripts pointed in the bug report, is a problem + that was already solved in amarok 1.4.4. + * Add dep on unzip (needed to uncompress albums). + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Thu, 15 Feb 2007 22:28:13 +0100 + +amarok (1.4.4-2) unstable; urgency=high + + * Patched magnatune code to avoid multiple credit-card charges. + (Closes: #402309) + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Tue, 12 Dec 2006 16:51:13 +0100 + +amarok (1.4.4-1) unstable; urgency=medium + + * Adding myself as uploader. ACK my last three NMUs... + * Removed circular dependencies. Now amarok-engines and amarok-$engine + Recommends: amarok, instead of depends on amarok (Closes: #368485). + * Fix kde#134333: properly compute total playlist length if there are + tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by + Modestas Vainius <geromanas@mailas.com>. + * Replaced ${Source-Version} with ${source:Version} and added versioned + build-dependency on dpkg-dev accordingly. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sun, 26 Nov 2006 03:42:59 +0100 + +amarok (2:1.4.7-0ubuntu3) gutsy; urgency=low + + * Added kubuntu_05_utf8_to_mtp_devices_fix.diff from upstream. (KDE + Bug #139722) + * Added kubuntu_06_fix_amarok_freeze_installing_mp3.diff from + upstream. (KDE Bug #147126, LP: #58617) Thanks markey for fixing + this! + * Added amarok Suggests: libxine1-ffmpeg. (LP: #134741) + * Added kubuntu_07_gnome_multimedia_keys.diff, a script that lets the + multimedia keys in GNOME work in amarok. (LP: #87299) + * Use adept_batch update in install-mp3 not apt-get update + + -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 01 Sep 2007 00:11:20 +1000 + +amarok (2:1.4.7-0ubuntu2) gutsy; urgency=low + + * Rebuild for libmtp5 -> libmtp6 library transition. + + -- Steve Kowalik <stevenk@ubuntu.com> Sat, 18 Aug 2007 00:55:59 +1000 + +amarok (2:1.4.7-0ubuntu1) gutsy; urgency=low + + * New Upstream version + * debian/control: replaced automake1.8 with automake1.9 + + -- Stephan Hermann <sh@sourcecode.de> Wed, 15 Aug 2007 09:47:17 +0200 + +amarok (2:1.4.6-0ubuntu2) gutsy; urgency=low + + * Rebuild for the libgpod1 -> libgpod2 library transition. + * Bump required version of the libgpod development headers. + + -- Steve Kowalik <stevenk@ubuntu.com> Tue, 17 Jul 2007 00:36:04 +1000 + +amarok (2:1.4.6-0ubuntu1) gutsy; urgency=low + + * New Upstream Release. (LP: #46526) + * Fixed kubuntu-media-amarok syntax (LP: #112252) + * Removed kubuntu_05_magnatune_security_fix.diff - fixed upstream + * Removed kubuntu_06_right_click_sound_control_fix.diff - fixed upstream + * Removed kubuntu_07_monge_exports_correct_symbols.diff - fixed + upstream + + -- Sarah Hobbs <hobbsee@ubuntu.com> Tue, 19 Jun 2007 01:09:37 +1000 + +amarok (2:1.4.5-0ubuntu7) feisty; urgency=low + + * Spelling correction: amaroK -> Amarok + * Description update (no kio support with libxine - yet) + + -- Harald Sitter <sitter.harald@gmail.com> Tue, 3 Apr 2007 17:45:46 +0200 + +amarok (2:1.4.5-0ubuntu6) feisty; urgency=low + + * Fixed the install-mp3 script + + -- Ryan Kavanagh <ryan@kubuntu.org> Tue, 6 Mar 2007 19:11:17 -0500 + +amarok (2:1.4.5-0ubuntu5) feisty; urgency=low + + * Added patches: + - kubuntu_05_magnatune_security_fix.diff. Fixes CVE #-2006-6979, + KDE Bug #138499 + - kubuntu_06_right_click_sound_control_fix.diff. KDE Bug #141672 + - kubuntu_07_monge_exports_correct_symbols.diff + * All patches from amarok SVN. + + -- Sarah Hobbs <hobbsee@ubuntu.com> Thu, 15 Feb 2007 15:32:32 +1100 + +amarok (2:1.4.5-0ubuntu4) feisty; urgency=low + + * Correct thinko in .install for installing the missing files. + + -- Steve Kowalik <stevenk@ubuntu.com> Wed, 14 Feb 2007 00:17:29 +1100 + +amarok (2:1.4.5-0ubuntu3) feisty; urgency=low + + * Update libmtp build-dep to 0.1.3-0ubuntu1 + * Install missing files (cd player .desktop file, libhttp11, amarok_addaspodcast.desktop) + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 7 Feb 2007 11:45:28 +0000 + +amarok (2:1.4.5-0ubuntu2) feisty; urgency=low + + * Added Build-dep libgpod-dev + * Fixed amarok.install + - Install collection bin files in the correct path + (Closes Malone #83454) + - Added back ipod lib (Closes Malone #83515) + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 06 Feb 2007 19:36:32 +0100 + +amarok (2:1.4.5-0ubuntu1) feisty; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed the following patches , adopted upstream + - invoke_browser.patch + - kubuntu_05_lastfm_xine.diff + - some-binaries-in-usr-lib.patch + - sparc-asm.patch + + [ Sarah Hobbs ] + * Added dependancy kdebase-kio-plugins. Closes malone #66764 + * Compiling without stack smashing protection. Closes malone #81768 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sun, 4 Feb 2007 00:46:12 -0600 + +amarok (2:1.4.4-0.3ubuntu4) feisty; urgency=low + + * No-change upload for the libpq4->libpq5 transition. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Jan 2007 15:39:10 +0000 + +amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low + + * Rebuild against libtunepimp5 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 8 Dec 2006 10:47:51 +0000 + +amarok (2:1.4.4-0.3ubuntu2) feisty; urgency=low + + * Add patch kubuntu_05_lastfm_xine.diff from upstream to make + last.fm streams work with Xine 1.1.3 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 5 Dec 2006 13:03:34 +0000 + +amarok (2:1.4.4-0.3ubuntu1) feisty; urgency=low + + * Fake Sync from debian unstable + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Thu, 23 Nov 2006 03:46:05 -0600 + +amarok (2:1.4.4-0ubuntu3) feisty; urgency=low + + * Compile with MTP Device Support + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Tue, 14 Nov 2006 22:13:11 -0600 + +amarok (2:1.4.4-0ubuntu2) feisty; urgency=low + + * Add debian/kubuntu-media-amarok and + debian amarok_play_audiocd.desktop for good KDE integration + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 03 Nov 2006 23:57:33 +0200 + +amarok (2:1.4.4-0ubuntu1) feisty; urgency=low + + * New Upstream Version + * Removed kubuntu_06_dapp_assert.diff and kubuntu_05_playlist_encoding.diff + adopted upstream + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Thu, 26 Oct 2006 16:19:30 -0500 + +amarok (1.4.4-0.3) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch invoke_browser.patch to allow amarok open external URLs. + (Closes: #397266). + * Removed dependency on xmms and updated README.Debian. Thanks to Bryan + Donlan and Michael Biebl. (Closes: #393141) + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sun, 19 Nov 2006 02:50:39 +0100 + +amarok (1.4.4-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch to fix build on sparc. Thanks to Jurij Smakov for the patch. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Sat, 4 Nov 2006 10:19:37 +0100 + +amarok (1.4.4-0.1) unstable; urgency=low + + * Non-maintainer upload with permission from the maintainer. + * New upstream release. + * Dropped patch 143_provided_upstream_playlist_encoding.diff, + merged by upstream. + * Moved architecture-dependent files from /usr/share to + /usr/lib. Thanks to Ted Percival. (Closes: #392392) + * Updated debian/compat to 5. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Tue, 31 Oct 2006 21:59:59 +0100 + +amarok (2:1.4.3-0ubuntu10) edgy; urgency=low + + * Make sure amarok_njb support is installed to the correct location + * Closes Malone: #61492 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sat, 14 Oct 2006 13:46:21 -0500 + +amarok (2:1.4.3-0ubuntu9) edgy; urgency=low + + * Set .pot name in debian/rules + + -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 1 Oct 2006 12:44:07 +0100 + +amarok (2:1.4.3-0ubuntu8) edgy; urgency=low + + * The DAAP client would crash Amarok under certain conditions when + kdelibs was compiled with asserts on. Thanks to Ian Monroe + * Closes KDE: #132851 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Wed, 20 Sep 2006 21:10:11 -0500 + +amarok (2:1.4.3-0ubuntu7) edgy; urgency=low + + * Various fixes to install-mp3 + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 20 Sep 2006 14:54:21 +0100 + +amarok (2:1.4.3-0ubuntu6) edgy; urgency=low + + * Added support for edgy ( and future TBA releases ) to install-mp3 + * Closes Malone #60637 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sat, 16 Sep 2006 03:56:07 -0500 + +amarok (2:1.4.3-0ubuntu5) edgy; urgency=low + + * Fixed a typo that prevented Amarok configuring Nomad Jukebox + in debian/rules + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sat, 16 Sep 2006 01:48:11 -0500 + +amarok (2:1.4.3-0ubuntu4) edgy; urgency=low + + * Built --with-libnjb support ( Creative Nomad Devices ) + * Added kubuntu_05_playlist_encoding.diff. This bug could result + in failure to restore the current playlist. (BR 133613) + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Fri, 15 Sep 2006 10:53:56 -0500 + +amarok (2:1.4.3-0ubuntu3) edgy; urgency=low + + * Fixed little error in install-mp3, in the case multiverse is + already activated. Code could be really optimized, but it works + as it is. I will probably make something clean after edgy release. + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 13 Sep 2006 22:26:14 +0200 + +amarok (2:1.4.3-0ubuntu2) edgy; urgency=low + + * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly. + (closes #59007) + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 17:02:14 +0200 + +amarok (2:1.4.3-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream + * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok + + [ Jonathan Riddell ] + * Remove automake1.7 build-dep + * Install all files + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Mon, 4 Sep 2006 22:08:14 -0500 + +amarok (2:1.4.2-0ubuntu3) edgy; urgency=low + + [ Jonathan Riddell ] + * Remove kubuntu_03_podir.diff, not built with tar in .orig + + [ Sarah Hobbs ] + * Added a more verbose error message when install-mp3 script fails + + [ Brandon Holtsclaw ] + * Collection scanner would only restart a maximum of 2 times instead of + 20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff + * MTP mediadevice support would not compile against libmtp versions gt + 0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff + * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015) + - kubuntu_05_audiocd.diff + * Fixed bug which prevented Amarok from creating the collection database + in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Thu, 31 Aug 2006 12:01:16 -0500 + +amarok (2:1.4.2-0ubuntu2) edgy; urgency=low + + * amarok_libvisual helper added to amarok.install (malone #57636) + * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Sun, 27 Aug 2006 05:52:34 -0500 + +amarok (2:1.4.2-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * Removed libgstreamer0.10-dev as its not needed anylonger + gst support has been droped upstream and in kubuntu + * Added libhal-dev as a build dep (malone #55779) + + [ Daniel Molkentin ] + * Install DAAP media device + + [ Sarah Hobbs ] + * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs + * Moved python-qt3 from recommends to depends. Closes bugs #55075, #48724 + * Removed python from suggests (already a dep of python-qt3) + * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins. Closes bug #55734 + * Compiled with libvisual support. Added build-dep libvisual-0.4-dev. Closes other half of bug #55734 + * Removed debian/amarok-gstreamer.install as we no longer distribute + amarok-gstreamer + * Change build-dep automake1.9 --> automake1.7 + * Changed build-dep debhelper --> debhelper (>=5) + * Bumped Compat to 5 + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Wed, 23 Aug 2006 07:11:02 -0500 + +amarok (2:1.4.1-0ubuntu3) edgy; urgency=low + + * Make debian/install-mp3 executable. Closes bug #52994 + * Install amarokapp in /usr/bin. Closes bugs #16474, #52360 + * Stopped compiling with exscalibar support - upstream + removed the moodbar + + -- Sarah Hobbs <hobbsee@ubuntu.com> Tue, 18 Jul 2006 13:55:53 +1000 + +amarok (2:1.4.1-0ubuntu2) edgy; urgency=low + + * Depend on amarok-xine not amarok-engines + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 12 Jul 2006 00:01:33 +0000 + +amarok (2:1.4.1-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 22:46:21 +0000 + +amarok (1.4.0a-1) unstable; urgency=low + + * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues: + + + does not botch migration from 1.3 SQLite collections, which in addition + caused further collection rebuilds to appear empty. (Closes: #368396) + + correctly closes database connections, thus not failing with "too many + open files" and deleting the collection after some hours in pause mode. + (Closes: #368086) + + audio CDs can be reproduced again. (Upstream #127388) + + * Switch to included SQLite; for some reason, dynamic linking against 3.3.5 + makes scores unfunctional. (Closes: #367468) + + -- Adeodato Simó <dato@net.com.org.es> Sat, 27 May 2006 15:23:14 +0200 + +amarok (1.4.0-1) unstable; urgency=low + + * New upstream release. The upstream tarball no longer ships the GStreamer + engine, and aRts support was dropped a while ago, and this upload only + includes the XINE engine. + + Bugs reported in the Debian BTS fixed in this version: + + + collection is updated at start up. (Closes: #330017) + + metadata for icecast streams is displayed. (Closes: #349796) + + the correct charset is used for lyrics URLs. (Closes: #352882) + + iPods are recognized even after emptying them. (Closes: #350305) + + non-ascii characters are displayed correctly under non UTF-8 + locales in the konqueror sidebar. (Closes: #353058) + + last.fm submission queue is flushed after network unavailability + even if no more tracks are played. (Closes: #344429) + + Regressions fixed since the latest beta: + + + iPod model detection works again, without needing libgpod-cvs. + (Closes: #364789) + + filling tags using MusicBrainz works again. (Closes: #364798) + + * Enable Moodbar support, now that Exscalibar has entered unstable. + (Closes: #364588) + + * Update Standards-Version to 3.7.2 (no changes required). + + -- Adeodato Simó <dato@net.com.org.es> Sun, 14 May 2006 16:42:14 -0500 + +amarok (1.4-beta3c-1) experimental; urgency=low + + * Third beta for the upcoming 1.4 version packaged. + + * Build against libtunepimp3-dev. + + -- Adeodato Simó <dato@net.com.org.es> Sat, 15 Apr 2006 19:47:54 +0200 + +amarok (1.4-beta2-3) experimental; urgency=low + + * Rebuild against libmysqlclient15off. (Closes: #358490) + + -- Adeodato Simó <dato@net.com.org.es> Thu, 23 Mar 2006 02:18:56 +0100 + +amarok (1.4-beta2-2) experimental; urgency=low + + * Fix yesterday's brainfart: aKode can't output to aRts, so remove this + statement from the description. + + * In addition, and after a bit of chit-chat with upstream, follow their + wishes and not package aKode at all (bye amarok-arts), and don't include + GStreamer 0.10 support for now. + + -- Adeodato Simó <dato@net.com.org.es> Mon, 6 Mar 2006 23:37:43 +0100 + +amarok (1.4-beta2-1) experimental; urgency=low + + * Second beta for the upcoming 1.4 version packaged. + + This release drops the aRts engine; in order to keep support for + outputting to aRts, ship the aKode engine in the amarok-arts package. + + Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update + build-dependencies and amarok-gstreamer's dependencies accordingly. + + * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0] + is overwritten correctly. This closes: #352171 (amaroK not remembering the + desktop it was on upon login), and incidentally makes Erich Schubert happy. + + * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed. + + -- Adeodato Simó <dato@net.com.org.es> Mon, 6 Mar 2006 05:44:33 +0100 + +amarok (1.4-beta1-r511476b) experimental; urgency=low + + * First beta (plus SVN) for the upcoming 1.4 version packaged. + (Closes: #352590) + + * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev), + and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590). + + * Since lyrics downloading is now implemented in a separate Ruby script, + promote ruby from Suggests to Recommends, so that functionality is ideally + not lost. Add a note with this information to README.Debian. + + * Link against sqlite dynamically again, since amaroK 1.4 can cope with the + restriction explained in the changelog entry for 1.3.1-1 and Bug#326648. + + -- Adeodato Simó <dato@net.com.org.es> Mon, 20 Feb 2006 05:42:15 +0100 + +amarok (1.3.9-1) unstable; urgency=medium + + * New upstream bugfix release. + + * Build against libtunepimp3-dev. (Closes: #359086) + + -- Adeodato Simó <dato@net.com.org.es> Thu, 27 Apr 2006 00:33:29 +0200 + +amarok (1.3.8-1) unstable; urgency=low + + * New upstream bugfix release: + + + fetching lyrics works again. (Closes: #344509) + + * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is + expected to work. (Closes: #342953) + + * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759) + + * Switch patch management to quilt, and make use of patchsys-quilt.mk. + + * Drop build-depends version constraints that are satisfied with stable. + Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were + transient and all arches have the minimum required versions in sid now. + + -- Adeodato Simó <dato@net.com.org.es> Wed, 18 Jan 2006 01:43:40 +0100 + +amarok (1.3.7-1) unstable; urgency=low + + * New upstream bugfix release. + + * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959) + Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev. + + * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in + testing and unstable, and I'll be using a backport for sarge packages. + Bump version constraint in debian/control. + + * Again, update my e-mail address in debian/control, yada yada. + + -- Adeodato Simó <dato@net.com.org.es> Wed, 07 Dec 2005 06:44:59 +0100 + +amarok (2:1.3.9-0ubuntu4) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach <daniel.holbach@ubuntu.com> Sun, 21 May 2006 16:16:47 +0200 + +amarok (2:1.3.9-0ubuntu3) dapper; urgency=low + + * Don't install hr translations, it's really Hindi + Closes Malone #44517 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 16 May 2006 00:14:56 +0300 + +amarok (2:1.3.9-0ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad <adconrad@ubuntu.com> Thu, 6 Apr 2006 12:46:44 +1000 + +amarok (2:1.3.9-0ubuntu1) dapper; urgency=low + + * New upstream release + * Use automake1.7, that's what the upstream file seems to use + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 25 Mar 2006 17:32:01 +0000 + +amarok (2:1.3.8-0ubuntu7) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 18:49:41 +0000 + +amarok (2:1.3.8-0ubuntu6) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 23 Feb 2006 12:28:47 +0000 + +amarok (2:1.3.8-0ubuntu5) dapper; urgency=low + + * Add kubuntu_03_podir.diff, change podir so .pot file gets + generated in a place that keeps the language pack scripts happy + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Feb 2006 19:09:30 +0000 + +amarok (2:1.3.8-0ubuntu4) dapper; urgency=low + + * Remove amarok-gstreamer from enginePackages substvars + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Feb 2006 11:44:19 +0000 + +amarok (2:1.3.8-0ubuntu3) dapper; urgency=low + + * Remove use of GCC 3.4 + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 16 Feb 2006 10:52:51 +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@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@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@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 Debian's + amarokrc file, which hides the splash screen + + -- Jonathan Riddell <jriddell@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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 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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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 diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/compat b/ubuntu/maverick/applications/amarok.cmake/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control new file mode 100644 index 000000000..7aa58f6d7 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control @@ -0,0 +1,98 @@ +Source: amarok-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> +Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, + kdelibs4-trinity-dev, + libxine-dev, libdbus-tqt-1-dev, + libtag1-dev, libsqlite3-dev, libtunepimp-dev, + libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev, + libvisual-0.4-dev, libsdl1.2-dev, + libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, + ruby, ruby1.8-dev, kdebase-trinity-dev, + libtool, libltdl-dev, cmake +Standards-Version: 3.8.4 +Homepage: http://amarok.kde.org + +Package: amarok-trinity +Architecture: any +Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends} +Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, + python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins +Description: versatile and easy to use audio player for KDE3 + 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 + - iPod and iRiver support + - Last.fm stream playing support (if ruby is installed) + - Track "mood" display (requires moodbar package installed) + . + Support for libvisual visualization plugins is also compiled in (you need + to have libvisual-0.4-plugins installed to be able to use it). + +Package: amarok-common-trinity +Architecture: all +Depends: ruby +Recommends: amarok-trinity (>= ${source:Version}) +Suggests: libqt0-ruby1.8, python, python-qt3 +Description: architecture independent files for Amarok [Trinity] + This package contains architecture independent files needed for Amarok to run + properly. It also provides Amarok documentation. Therefore, unless you have + 'amarok' package installed, you will hardly find this package useful. + . + You need to install Python if you intend to use Zeroconf support, WebControl + and/or playlist2html scripts. You will also need python-qt3 for the + WebControl script. + +Package: amarok-engines-trinity +Architecture: all +Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version}) +Description: output engines for the Amarok music player [Trinity] + This package serves merely as a reference point if you want to install + all available Amarok engines. It depends on those Amarok engines that + generally can be used by most users. You can safely remove this metapackage + as you can remove the amarok-engine-$engine packages that you don't use. + +Package: amarok-engine-xine-trinity +Architecture: any +Depends: ${shlibs:Depends} +Recommends: amarok-trinity (= ${binary:Version}) +Description: xine engine for the Amarok audio player [Trinity] + 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-engine-yauap-trinity +Architecture: any +Depends: yauap, ${shlibs:Depends} +Recommends: amarok-trinity (= ${binary:Version}) +Description: Yauap engine for the Amarok audio player [Trinity] + This package includes Amarok yauap engine, which provides a frontend + to Yauap Commandline Audio Player. DBus is used as a means of communication + between the engine and Yauap. Please note that some extra Amarok features + (like visualizations) might not be available while using this engine. + +Package: amarok-trinity-dbg +Priority: extra +Architecture: any +Depends: amarok-trinity (= ${binary:Version}) +Recommends: kdelibs-trinity-dbg +Description: debugging symbols for Amarok [Trinity] + This package provides debugging symbols for all binary packages built from + amarok source package. It's highly recommended to have this package installed + before reporting any Amarok crashes to either Amarok developers or Debian + package maintainers. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control.in b/ubuntu/maverick/applications/amarok.cmake/debian/control.in new file mode 100644 index 000000000..314cdab75 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control.in @@ -0,0 +1,97 @@ +Source: amarok-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, libtool, + kdelibs4-trinity-dev, + libxine-dev, libdbus-qt-1-dev, + libtag1-dev, libsqlite3-dev, libtunepimp-dev, + libmysqlclient15-dev, libpq-dev, + libvisual-0.4-dev, libsdl1.2-dev, + libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, + ruby, ruby1.8-dev +Standards-Version: 3.8.3 +Homepage: http://amarok.kde.org + +Package: amarok-trinity +Architecture: any +Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends} +Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser, + python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins +Description: versatile and easy to use audio player for KDE3 + 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 + - iPod and iRiver support + - Last.fm stream playing support (if ruby is installed) + - Track "mood" display (requires moodbar package installed) + . + Support for libvisual visualization plugins is also compiled in (you need + to have libvisual-0.4-plugins installed to be able to use it). + +Package: amarok-common-trinity +Architecture: all +Depends: ruby +Recommends: amarok-trinity (>= ${source:Version}) +Suggests: libqt0-ruby1.8, python, python-qt3 +Description: architecture independent files for Amarok [Trinity] + This package contains architecture independent files needed for Amarok to run + properly. It also provides Amarok documentation. Therefore, unless you have + 'amarok' package installed, you will hardly find this package useful. + . + You need to install Python if you intend to use Zeroconf support, WebControl + and/or playlist2html scripts. You will also need python-qt3 for the + WebControl script. + +Package: amarok-engines-trinity +Architecture: all +Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version}) +Description: output engines for the Amarok music player [Trinity] + This package serves merely as a reference point if you want to install + all available Amarok engines. It depends on those Amarok engines that + generally can be used by most users. You can safely remove this metapackage + as you can remove the amarok-engine-$engine packages that you don't use. + +Package: amarok-engine-xine-trinity +Architecture: any +Depends: ${shlibs:Depends} +Recommends: amarok-trinity (= ${binary:Version}) +Description: xine engine for the Amarok audio player [Trinity] + 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-engine-yauap-trinity +Architecture: any +Depends: yauap, ${shlibs:Depends} +Recommends: amarok-trinity (= ${binary:Version}) +Description: Yauap engine for the Amarok audio player [Trinity] + This package includes Amarok yauap engine, which provides a frontend + to Yauap Commandline Audio Player. DBus is used as a means of communication + between the engine and Yauap. Please note that some extra Amarok features + (like visualizations) might not be available while using this engine. + +Package: amarok-trinity-dbg +Priority: extra +Architecture: any +Depends: amarok-trinity (= ${binary:Version}) +Recommends: kdelibs-trinity-dbg +Description: debugging symbols for Amarok [Trinity] + This package provides debugging symbols for all binary packages built from + amarok source package. It's highly recommended to have this package installed + before reporting any Amarok crashes to either Amarok developers or Debian + package maintainers. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/copyright b/ubuntu/maverick/applications/amarok.cmake/debian/copyright new file mode 100644 index 000000000..2775890ba --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/copyright @@ -0,0 +1,51 @@ +Debianized by Peter Rockai <mornfall@mornfall.homeip.net> 2004-04-11 +New maintainer Adeodato Simó <dato@net.com.org.es> 2004-09-22 +New maintainer Modestas Vainius <modestas@vainius.eu> 2007-12-24 + +It was downloaded from: + + <ftp://ftp.kde.org/pub/kde/stable/amarok/> + +And the project homepage is: + + <http://amarok.kde.org> + +Upstream Authors: + + | Alexandre Oliveira <aleprj@gmail.com> + | Christian Muehlhaeuser <chris@chris.de> + | Frederik Holljen <fh@ez.no> + | Gábor Lehel <illissius@gmail.com> + | Ian Monroe <ian@monroe.nu> + | Jeff Mitchell <kde-dev@emailgoeshere.com> + | Mark Kretschmann <markey@web.de> + | Martin Aumueller <aumuell@reserv.at> + | Max Howell <max.howell@methylblue.com> + | Mike Diehl <madpenguin8@yahoo.com> + | Pierpaolo Di Panfilo <pippo_dp@libero.it> + | Roman Becker <roman@formmorf.de> + | Seb Ruiz <me@sebruiz.net> + | Stanislav Karchebny <berkus@madfire.net> + +Copyright: + + | © 2002-2003, Mark Kretschmann + | © 2003-2006, The Amarok Development Squad + +License terms: + + | 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 + + The full text of the GNU General Public License version 2 is available on + Debian systems in /usr/share/common-licenses/GPL-2. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok-16.xpm b/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok-16.xpm new file mode 100644 index 000000000..80a228f20 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok-16.xpm @@ -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.@.% 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" +}; diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok.xpm b/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok.xpm new file mode 100644 index 000000000..6411e36d0 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok.xpm @@ -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 @.@.8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.", +"{.{.{.{. . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.", +"{.{.{.{.{. > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X {.{.{.{.{.", +"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.", +"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{." +}; diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 new file mode 100644 index 000000000..7b06cbd2f --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 @@ -0,0 +1,40 @@ +check_mp3() { + + INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install` + + if [ -z "$INSTALLED" ]; then + if [ -x /opt/trinity/bin/kdialog ]; then + kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." --icon amarok + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." + else + Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60 + fi + exit 1 + else + if [ -x /opt/trinity/bin/kdialog ]; then + kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." --icon amarok + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "MP3 support now installed, you will need to restart Amarok." + else + Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60 + fi + exit 0 + fi +} + +INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install` + +#is available, not installed +if [ -z "$INSTALLED" ]; then + if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then + /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg" + elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then + gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'" + else + xterm -e 'sudo apt-get install libxine1-ffmpeg' + fi + check_mp3 +fi + +exit 0 diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/kubuntu-media-amarok b/ubuntu/maverick/applications/amarok.cmake/debian/kubuntu-media-amarok new file mode 100644 index 000000000..dacf7fc55 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/kubuntu-media-amarok @@ -0,0 +1,16 @@ +#!/bin/bash + +DEVICE=$@ + +if [ -n "$DEVICE" ];then + if [ ${DEVICE:0:7} = "audiocd" ]; then + amarok --cdplay ${DEVICE#*=} + elif [ ${DEVICE:0:1} = "/" ]; then + amarok --cdplay `dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1` + else + amarok --cdplay /dev/cdrom + fi +else + amarok --cdplay /dev/cdrom +fi + diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok-trinity.1 b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok-trinity.1 new file mode 100644 index 000000000..dac3bb8aa --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok-trinity.1 @@ -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 diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 new file mode 100644 index 000000000..c932b9b0c --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 @@ -0,0 +1,14 @@ +.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius +.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok" +.SH NAME +amarok_libvisual \- LibVisual support utility for Amarok +.SH SYNOPSIS +amarok_libvisual +.SH DESCRIPTION +This is LibVisual support helper utility for Amarok. It's used internally by Amarok +itself when needed and is not supposed to be invoked manually by user. +.SS +.SH AUTHORS +Amarok Developers +.SH OTHER +This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokapp-trinity.1 b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokapp-trinity.1 new file mode 100644 index 000000000..0850440dd --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokapp-trinity.1 @@ -0,0 +1,23 @@ +.\" Generated by kdemangen.pl and edited by hand +.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for KDE" +.SH NAME +amarokapp +\- A direct executable for Amarok. +.SH SYNOPSIS +amarokapp [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. +.P +This is direct Amarok executable. The recommend way to run Amarok is using +\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're +debugging Amarok with gdb, valgrind or similar program, you will probably want to +run it against this binary directly. +.P +\fBamarokapp(1)\fP takes the same command line options and arguments as +\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP. +.SH SEE ALSO +amarok(1) +.SH OTHER +This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 new file mode 100644 index 000000000..f4abfd1b2 --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 @@ -0,0 +1,63 @@ +.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius +.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok" +.SH NAME +amarokcollectionscanner \- Collection Scanner for Amarok +.SH SYNOPSIS +amarokcollectionscanner [Qt\-options] [KDE\-options] Folder(s) +.SH DESCRIPTION +This Amarok helper utility scans folder(s) given on the command line or +restarts previous scan if \fB\-\-restart\fP option was given and writes a +specially structured XML file to standard output with extensive information +(including tags) about audio files it was able to find. XML file schema used +by this utility is Amarok specific. +.P +You may find his utility useful if you need to retreive and/or display extended +information about collection of audio files. +.SH OPTIONS +.SS +.SS Arguments: +Folder(s) Folders to scan +.SS +.SS Options: +.TP +.B \-r, \-\-recursive +Scan folders recursively +.TP +.B \-i, \-\-incremental +Incremental Scan (modified folders only) +.TP +.B \-p, \-\-importplaylists +Import playlist +.TP +.B \-s, \-\-restart +Restart the scanner at last position, after a crash [] +.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 +.SH AUTHORS +Amarok Developers +.SH OTHER +This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/patches/series b/ubuntu/maverick/applications/amarok.cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/patches/series diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/rules b/ubuntu/maverick/applications/amarok.cmake/debian/rules new file mode 100755 index 000000000..4fd9a743d --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ +-DWITH_IFP="ON" -DWITH_NJB="ON" -DWITH_MTP="ON" -DWITH_DAAP="ON" -DWITH_YAUAP="ON" \ +-DWITH_LIBVISUAL="ON" -DWITH_KONQSIDEBAR="ON" -DWITH_XINE="ON" -DWITH_IPOD="ON" + +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true + +### VARIABLES +# Exempt amarok engines from being handled as proper public libraries +# by dh_makeshlibs +DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine-trinity + +export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok-trinity + +#DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \ +# --disable-final \ +# --without-akode \ +# --without-gstreamer10 \ +# --without-libkarma \ +# --with-ifp \ +# --with-libgpod \ +# --with-libnjb \ +# --with-libmtp \ +# --enable-mysql \ +# --enable-postgresql \ +# --with-yauap \ +# --prefix=/opt/trinity \ +# --with-extra-libs=/usr/lib/mesa + +# Ship upstream README in amarok docs +DEB_INSTALL_DOCS_ALL = +DEB_INSTALL_DOCS_amarok-trinity = $(DEB_SRCDIR)/README + +# Amarok engines should not auto-depend on amarok. +# Appropriate relationships are set manually in the control file. +DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine-trinity = -- -xamarok-trinity +DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap-trinity = -- -xamarok-trinity + +binary-fixup/amarok-common-trinity:: + # Fix permissions of some amarok scripts + chmod a+x \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/playlist2html/Playlist.py \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/ruby_debug/debug.rb \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/python_qt_template.py \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/ruby_qt_template.rb \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/Playlist.py \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/RequestHandler.py + +binary-post-install/amarok-common-trinity:: + # Remove excess COPYING files from script directories + rm -f \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/COPYING \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_lyrc/COPYING \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_default/COPYING \ + debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_impulsive/COPYING + # Remove Mac OSX resource fork file + rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb + +### POST-INSTALL HACKING +common-binary-post-install-arch:: + # Check for not installed files + dh_install --no-act --list-missing + + chmod a+x debian/amarok-trinity/opt/trinity/lib/amarok/install-mp3 + chmod +x debian/amarok-trinity/opt/trinity/bin/kubuntu-media-amarok + ln -s /opt/trinity/bin/amarokapp debian/amarok-trinity/opt/trinity/lib/amarok/amarokapp diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/watch b/ubuntu/maverick/applications/amarok.cmake/debian/watch new file mode 100644 index 000000000..b0a7420bb --- /dev/null +++ b/ubuntu/maverick/applications/amarok.cmake/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=pasv ftp://ftp.kde.org/pub/kde/stable/amarok/([0-9.]+)/src/amarok-([0-9.]+)\.tar\.bz2 diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk index 888f4be38..47e83ef4a 100644 --- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,7 @@ 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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index 7aa58f6d7..a0c2c0ebf 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -11,8 +11,8 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, - ruby, ruby1.8-dev, kdebase-trinity-dev, - libtool, libltdl-dev, cmake + ruby, ruby1.8-dev, + automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://amarok.kde.org diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules index 4fd9a743d..1e2caae64 100755 --- a/ubuntu/maverick/applications/amarok/debian/rules +++ b/ubuntu/maverick/applications/amarok/debian/rules @@ -1,27 +1,16 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - +### CDBS INCLUDES include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_IFP="ON" -DWITH_NJB="ON" -DWITH_MTP="ON" -DWITH_DAAP="ON" -DWITH_YAUAP="ON" \ --DWITH_LIBVISUAL="ON" -DWITH_KONQSIDEBAR="ON" -DWITH_XINE="ON" -DWITH_IPOD="ON" +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) ### VARIABLES # Exempt amarok engines from being handled as proper public libraries @@ -30,20 +19,20 @@ DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine-trinity export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok-trinity -#DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \ -# --disable-final \ -# --without-akode \ -# --without-gstreamer10 \ -# --without-libkarma \ -# --with-ifp \ -# --with-libgpod \ -# --with-libnjb \ -# --with-libmtp \ -# --enable-mysql \ -# --enable-postgresql \ -# --with-yauap \ -# --prefix=/opt/trinity \ -# --with-extra-libs=/usr/lib/mesa +DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \ + --disable-final \ + --without-akode \ + --without-gstreamer10 \ + --without-libkarma \ + --with-ifp \ + --with-libgpod \ + --with-libnjb \ + --with-libmtp \ + --enable-mysql \ + --enable-postgresql \ + --with-yauap \ + --prefix=/opt/trinity \ + --with-extra-libs=/usr/lib/mesa # Ship upstream README in amarok docs DEB_INSTALL_DOCS_ALL = @@ -54,6 +43,45 @@ DEB_INSTALL_DOCS_amarok-trinity = $(DEB_SRCDIR)/README DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine-trinity = -- -xamarok-trinity DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap-trinity = -- -xamarok-trinity +### Libtool and Automake updates +# Autoguess automake /usr/share subdirectory. Insure from failures +DEB_AUTOMAKE_SHARE_DIR = /usr/share/automake-$(shell automake --version | head -n 1 | sed 's/^automake (GNU automake) \([0-9]\+\.[0-9]\+\).*/\1/') +ifneq ($(words $(DEB_AUTOMAKE_SHARE_DIR)),1) +DEB_AUTOMAKE_SHARE_DIR = +endif + +post-patches:: debian/stamp-automake +debian/stamp-automake: + touch debian/stamp-automake-started + if test -n "$(DEB_AUTOMAKE_SHARE_DIR)"; then \ + for f in $(DEB_AUTOMAKE_SHARE_DIR)/*; do \ + if test -f $$f && \ + test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \ + cp -f $$f $(DEB_SRCDIR)/admin; \ + fi; \ + done; \ + fi + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common + touch $@ + +# Install ${curpkg}.install as lintian overrides +$(patsubst %,binary-install/%,$(DEB_PACKAGES)):: + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + fi + +clean:: + if test -d $(DEB_SRCDIR) && test -f debian/stamp-automake-started; then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi + rm -f debian/stamp-automake* + binary-fixup/amarok-common-trinity:: # Fix permissions of some amarok scripts chmod a+x \ |