diff -u audacious-1.5.1/debian/control audacious-1.5.1/debian/control --- audacious-1.5.1/debian/control +++ audacious-1.5.1/debian/control @@ -1,7 +1,8 @@ Source: audacious Section: sound Priority: optional -Maintainer: Debian Audacious Packagers +Maintainer: Ubuntu MOTU +XSBC-Original-Maintainer: Debian Audacious Packagers Uploaders: William Pitcock , Adam Cécile (Le_Vert) Homepage: http://www.audacious-media-player.org/ Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.10), libglade2-dev (>= 2.3.1), quilt, imagemagick, libmcs-dev (>= 0.4.1), libsamplerate0-dev | libsamplerate-dev, libmowgli-dev (>= 0.4), libdbus-glib-1-dev (>= 0.60), libdbus-1-dev (>= 0.60) @@ -9,7 +10,7 @@ Package: audacious Architecture: any -Depends: ${shlibs:Depends}, audacious-plugins (>= 1.5.1), audacious-plugins (<< 2.0~), gtk2-engines-pixbuf, dbus, libaudid3tag1 (= ${binary:Version}), libaudclient1 (= ${binary:Version}) +Depends: ${shlibs:Depends}, audacious-plugins (>= 1.5.1), audacious-plugins (<< 2.0~), gtk2-engines-pixbuf, dbus, libaudid3tag1 (>= ${binary:Version}), libaudclient1 (>= ${binary:Version}) Recommends: audacious-plugins-extra (>= 1.5.1), audacious-plugins-extra (<< 2.0~), unzip Description: small and fast audio player which supports lots of formats Audacious is a fork of beep-media-player which supports winamp skins diff -u audacious-1.5.1/debian/rules audacious-1.5.1/debian/rules --- audacious-1.5.1/debian/rules +++ audacious-1.5.1/debian/rules @@ -9,6 +9,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) # Define CFLAGS CFLAGS = -Wall -g @@ -18,6 +19,12 @@ CFLAGS += -O2 endif +ifeq ($(DEB_HOST_GNU_CPU),x86_64) + DISABLE_SSE2 := +else + DISABLE_SSE2 := --disable-sse2 +endif + DESTDIR = $(CURDIR)/debian/tmp config.status: configure $(QUILT_STAMPFN) @@ -33,7 +40,7 @@ --prefix=/usr \ --mandir=/usr/share/man \ --disable-rpath \ - --disable-sse2 \ + $(DISABLE_SSE2) \ --enable-ipv6 \ --enable-chardet \ --enable-samplerate \ diff -u audacious-1.5.1/debian/changelog audacious-1.5.1/debian/changelog --- audacious-1.5.1/debian/changelog +++ audacious-1.5.1/debian/changelog @@ -1,3 +1,27 @@ +audacious (1.5.1-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, remaining changes: + + debian/control: + - Change maintainer to Ubuntu MOTU. + - Change the audacious dependencies on libaudid3tag1 and libaudclient1 + to be >= ${binary:Version} to fix package uninstallability. + + debian/patches/change-default-output-plugin.patch: Change the + default output plugin to pulseaudio. (LP: #175536). It is not added to + debian/patches/series, because it needs to be rebased. + * Dropped Ubuntu changes: + - *index.html*: Removed (probably a packaging mistake). + - debian/patches/00list: Removed, because the Debian package use quilt + (series) instead of dpatch (00list) as patch system. + - Removed all changes to the translation files, because they only affect + the file structure and not the content. + * Add bugzilla-42.patch to resolve a playlist bug where entry->tuple is NULL + but we try to access it. This results in huge log file (LP: #258797). This + patch will be in the next upstream release. + * debian/rules: Do not disable SSE2 on x86_64, because all x86_64 CPUs + support SSE2. + + -- Benjamin Drung Tue, 19 Aug 2008 16:02:12 +0200 + audacious (1.5.1-3) unstable; urgency=medium * Change dependency relations to make the package installable. @@ -5,6 +29,24 @@ -- William Pitcock Sun, 20 Jul 2008 23:10:13 -0500 +audacious (1.5.1-2ubuntu2) intrepid; urgency=low + + * debian/control: Change the audacious dependencies on libaudid3tag1 + and libaudclient1 to be >= ${source:Upstream-Version}, to fix package + uninstallability. + + -- Luke Yelavich Wed, 23 Jul 2008 11:25:12 +1000 + +audacious (1.5.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: Change maintainer to Ubuntu MOTU. + + debian/patches/004-change-default-output-plugin.dpatch: + - Change the default output plugin to pulseaudio. (LP: #175536) + + debian/patches/00list: Add change-default-output-plugin to list. + + -- Emanuele Gentili Mon, 21 Jul 2008 18:56:36 +0200 + audacious (1.5.1-2) unstable; urgency=medium * Build without SSE2 support where appropriate. @@ -19,6 +61,22 @@ -- William Pitcock Thu, 17 Jul 2008 20:10:07 -0500 +audacious (1.5.1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Change maintainer to Ubuntu MOTU. + - debian/patches/004-change-default-output-plugin.dpatch: Change the + default output plugin to pulseaudio. (LP: #175536) + - debian/patches/00list: Add change-default-output-plugin to list. + * Dropped + - debian/patches/audacious-pulse.diff, + debian/patches/audacious-pulse.diff.1: These patches were are neither + included in debian/00list nor debian/series, and are not used anywhere + in the build. They are also not mentioned in this changelog anywhere. + They appear to be entirely superfluous. Dropping to sync with Debian. + + -- Dustin Kirkland Wed, 25 Jun 2008 00:53:50 -0500 + audacious (1.5.1-1) unstable; urgency=low * New upstream release, highlights include (Closes: #483095): @@ -43,6 +101,22 @@ -- William Pitcock Thu, 05 Jun 2008 23:07:17 -0500 +audacious (1.5.0-2ubuntu2) intrepid; urgency=low + + * Replace patch 004 with a correct one from upstream, thanks to William + Pitcock for pointing out the problem with the old one and providing + a solution. (LP: #175536) + + -- Timo Aaltonen Mon, 05 May 2008 15:43:15 +0300 + +audacious (1.5.0-2ubuntu1) intrepid; urgency=low + + * 004-change-default-output-plugin.dpatch: + Change the default output plugin to pulseaudio. (LP: #175536) + * Change the Maintainer address. + + -- Timo Aaltonen Mon, 05 May 2008 12:19:00 +0300 + audacious (1.5.0-2) unstable; urgency=low * Configure without SSE2 support (Closes: #471061). diff -u audacious-1.5.1/debian/patches/series audacious-1.5.1/debian/patches/series --- audacious-1.5.1/debian/patches/series +++ audacious-1.5.1/debian/patches/series @@ -3,0 +4 @@ +bugzilla-42.patch only in patch2: unchanged: --- audacious-1.5.1.orig/debian/patches/bugzilla-42.patch +++ audacious-1.5.1/debian/patches/bugzilla-42.patch @@ -0,0 +1,21 @@ +diff -Naur audacious-1.5.1-ori/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c +--- audacious-1.5.1-ori/src/audacious/playlist.c 2008-07-17 11:46:51.000000000 +0200 ++++ audacious-1.5.1/src/audacious/playlist.c 2008-07-17 12:00:24.000000000 +0200 +@@ -2429,7 +2429,7 @@ + /* Entry disappeared while we looked it up. + Restart. */ + node = playlist->entries; +- else if ((entry->tuple != NULL || entry->title != NULL) && ++ else if (entry->tuple != NULL && + tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 && + tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) + { +@@ -2480,7 +2480,7 @@ + node = g_list_nth(playlist->entries, + playlistwin_get_toprow()); + } +- else if ((entry->tuple != NULL || entry->title != NULL) && ++ else if (entry->tuple != NULL && + tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 && + tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) { + update_playlistwin = TRUE; only in patch2: unchanged: --- audacious-1.5.1.orig/debian/patches/change-default-output-plugin.patch +++ audacious-1.5.1/debian/patches/change-default-output-plugin.patch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 004-change-default-output-plugin.dpatch by William Pitcock +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes the default skin back to Default1.3 due to people complaining +## DP: about the skin offered by 1.4. Those people are encouraged to provide a +## DP: better alternative skin than this, but this will do for now. + +@DPATCH@ +diff -r b987389926c5 -r d56a54cf5952 src/audacious/main.c +--- a/src/audacious/main.c Thu Mar 13 23:59:17 2008 +0100 ++++ b/src/audacious/main.c Mon May 05 08:02:02 2008 -0500 +@@ -446,12 +446,12 @@ GList *dock_window_list = NULL; + + /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */ + static gchar *pl_candidates[] = { ++ PLUGIN_FILENAME("pulse_audio"), + PLUGIN_FILENAME("ALSA"), + PLUGIN_FILENAME("coreaudio"), + PLUGIN_FILENAME("OSS"), + PLUGIN_FILENAME("sun"), + PLUGIN_FILENAME("ESD"), +- PLUGIN_FILENAME("pulse_audio"), + PLUGIN_FILENAME("disk_writer"), + NULL + }; +@@ -695,7 +695,9 @@ bmp_config_load(void) + + for (iter = 0; pl_candidates[iter] != NULL && cfg.outputplugin == NULL; iter++) + { +- cfg.outputplugin = find_file_recursively(pl_path, pl_candidates[iter]); ++ gchar *tmp = find_file_recursively(pl_path, pl_candidates[iter]); ++ cfg.outputplugin = g_strdup_printf("%s (#0)", tmp); ++ g_free(tmp); + } + + g_free(pl_path); +diff -r b987389926c5 -r d56a54cf5952 src/audacious/pluginenum.h +--- a/src/audacious/pluginenum.h Thu Mar 13 23:59:17 2008 +0100 ++++ b/src/audacious/pluginenum.h Mon May 05 08:02:02 2008 -0500 +@@ -28,7 +28,7 @@ + #include + #include "config.h" + +-#define PLUGIN_FILENAME(name) ("lib" name SHARED_SUFFIX) ++#define PLUGIN_FILENAME(name) (name SHARED_SUFFIX) + + void plugin_system_init(void); + void plugin_system_cleanup(void);