diff -u audacious-1.4.6/debian/control audacious-1.4.6/debian/control --- audacious-1.4.6/debian/control +++ audacious-1.4.6/debian/control @@ -1,7 +1,8 @@ Source: audacious Section: sound Priority: optional -Maintainer: Adam Cécile (Le_Vert) +Maintainer: Ubuntu MOTU Team +XSBC-Original-Maintainer: Adam Cécile (Le_Vert) Uploaders: William Pitcock Homepage: http://www.audacious-media-player.org/ Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.6), libglade2-dev (>= 2.3.1), dpatch, 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) diff -u audacious-1.4.6/debian/patches/00list audacious-1.4.6/debian/patches/00list --- audacious-1.4.6/debian/patches/00list +++ audacious-1.4.6/debian/patches/00list @@ -2,2 +2,3 @@ 001-libaudid3tag_is_a_public_library.dpatch +002-use_pulseaudio_by_default.dpatch 003-change-default-skin.dpatch diff -u audacious-1.4.6/debian/changelog audacious-1.4.6/debian/changelog --- audacious-1.4.6/debian/changelog +++ audacious-1.4.6/debian/changelog @@ -1,10 +1,18 @@ +audacious (1.4.6-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use pulseaudio as the default Output sink in Audacious. + - Maintainer reassignment + + -- Jérôme Guelfucci Sat, 02 Feb 2008 14:17:14 +0100 + audacious (1.4.6-1) unstable; urgency=low * New upstream release. * debian/patches/002-fix-eqf-import.patch: - Upstream has included this in 1.4.6, dropped. - -- William Pitcock Thu, 31 Jan 2008 14:45:57 -0600 + -- William Pitcock Thu, 31 Jan 2008 14:45:57 -0600 audacious (1.4.5-2) unstable; urgency=low @@ -21,6 +29,14 @@ -- William Pitcock Sun, 20 Jan 2008 16:59:07 -0600 +audacious (1.4.5-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + - Use pulseaudio as the default Output sink in Audacious. + - Maintainer reassignment + + -- William Pitcock Thu, 03 Jan 2008 02:27:09 -0600 + audacious (1.4.5-1) unstable; urgency=low * New upstream release. @@ -29,6 +45,14 @@ -- William Pitcock Sat, 29 Dec 2007 15:38:17 -0600 +audacious (1.4.4-1ubuntu1) hardy; urgency=low + + * Use pulseaudio as the default Output sink in Audacious. LP: #175536 + * Set Maintainer: to Ubuntu MOTU Media due to unmerged modifications, and + set XSBC-Original-Maintainer. + + -- William Pitcock Sun, 23 Dec 2007 17:07:01 -0600 + audacious (1.4.4-1) unstable; urgency=low * New upstream release (Closes: #452884). only in patch2: unchanged: --- audacious-1.4.6.orig/debian/patches/002-use_pulseaudio_by_default.dpatch +++ audacious-1.4.6/debian/patches/002-use_pulseaudio_by_default.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 002-use_pulseaudio_by_default.dpatch by William Pitcock +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Makes Audacious try to use the PulseAudio plugin first on first run. + +@DPATCH@ + +diff -r e490d1ea0c0c src/audacious/main.c +--- a/src/audacious/main.c Wed Dec 19 00:57:45 2007 -0600 ++++ b/src/audacious/main.c Sun Dec 23 17:10:10 2007 -0600 +@@ -407,12 +407,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 + };