--- rhythmbox-0.11.5.orig/debian/compat
+++ rhythmbox-0.11.5/debian/compat
@@ -0,0 +1 @@
+5
--- rhythmbox-0.11.5.orig/debian/changelog
+++ rhythmbox-0.11.5/debian/changelog
@@ -0,0 +1,1654 @@
+rhythmbox (0.11.5-0ubuntu8.8.04.2netbook1) netbook-common; urgency=low
+
+  * Merged with hardy-security. Remaining changes:
+    - Use backup import folder of rb_music_dir()
+
+ -- Nicolas Valcárcel Scerpella <nicolas.valcarcel@canonical.com>  Fri, 02 Jul 2010 11:28:25 -0500
+
+rhythmbox (0.11.5-0ubuntu8.8.04.2) hardy-security; urgency=low
+
+  * Update for Firefox 3.6.x transition
+    - see USN-930-1
+  * Provide a symlink for the mozilla plugin in /usr/lib/mozilla
+    - update debian/rhythmbox.links
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Thu, 10 Jun 2010 21:13:27 +0100
+
+rhythmbox (0.11.5-0ubuntu8netbook1) hardy; urgency=low
+
+  * debian/patches/07_fix_import_error.patch:
+    - Use backup import folder of rb_music_dir() (LP: #263571)
+
+ -- Michael Terry <michael.terry@canonical.com>  Fri, 05 Sep 2008 13:51:18 -0400
+
+rhythmbox (0.11.5-0ubuntu8) hardy-proposed; urgency=low
+
+  * debian/patches/70_from_svn_fix_incorrect_shuffle_detection.patch:
+    - change from svn, correctly detect the new ipod shuffle devices
+  * debian/patches/71_from_svn_fix_ipod_aac_copies.patch:
+    - change from svn, don't convert aac when they are copied to an ipod 
+      (lp: #164265)
+  * debian/patches/72_from_svn_ipod_correct_set_year_tag.patch:
+    - change from svn, correctly set the year when copying a song to an ipod
+      (lp: #144273)
+	
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 12 Jun 2008 10:32:09 +0200
+
+rhythmbox (0.11.5-0ubuntu7) hardy-proposed; urgency=low
+
+  * debian/patches/81_use_uri_to_import_directory.patch:
+    - set the library uri correctly, fix import issues for songs which use 
+      whitespaces, thanks to Josh Smith who tracked the bug (lp: #147883)
+  * debian/patches/95_from_svn_extra_translatable_strings.patch:
+    - change from svn, mark some extra strings as translatable
+  * debian/patches/96_from_svn_fix_artwork_crasher.patch:
+    - change from svn, don't try to get the artwork when there is no
+      album or artist information available (lp: #209405)
+  * debian/patches/97_from_svn_fix_ipod_crasher.patch:
+    - change from svn, correctly set the signal to avoid a crasher (lp: #177660)
+  * debian/patches/98_from_svn_correctly_handle_playing_changes.patch:
+    - change from svn, correctly handle the playing changes, fix titles not
+      being correctly updated and some crashers (lp: #121358, #128162, #137986)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 13 May 2008 14:48:28 +0200
+
+rhythmbox (0.11.5-0ubuntu6) hardy; urgency=low
+
+  * debian/rhythmbox.gconf-defaults:
+    - don't activate the power manager option it breaks suspend for example
+      (lp: #78038)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 21 Apr 2008 14:59:43 +0200
+
+rhythmbox (0.11.5-0ubuntu5) hardy; urgency=low
+
+  * debian/patches/94_from_svn_fix_podcast_parsing_issue.patch:
+    - change from svn, fix podcast parsing issue
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 21 Apr 2008 14:56:58 +0200
+
+rhythmbox (0.11.5-0ubuntu4) hardy; urgency=low
+
+  * debian/patches/93_from_svn_fix_xfade_locking_issue.patch:
+    - change from svn, fix some xfade locking issues (lp: #207450)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 14 Apr 2008 15:35:55 +0200
+
+rhythmbox (0.11.5-0ubuntu3) hardy; urgency=low
+
+  * debian/patches/92_from_svn_fix_amazon_coverts_download.patch:
+    - change from svn, fix the amazon coverts download (lp: #209019)
+  * debian/patches/93_from_svn_fix_cdda_gvfs_handling.patch:
+    - change from svn, switch to the audio cd entry when rhythmbox 
+      is autostarted or when clicking on an cd icon in nautilus 
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 11 Apr 2008 17:31:12 +0200
+
+rhythmbox (0.11.5-0ubuntu2) hardy; urgency=low
+
+  * debian/control.in,
+    debian/patches/01_lpi.patch:
+    - updated to the new launchpad integration version
+  * debian/patches/06_oggradios.patch:
+    - updated the initial ogg stations list using the redhat one,
+      should fix the playback issues due to not responding servers (lp: #183825)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 10 Apr 2008 00:51:43 +0200
+
+rhythmbox (0.11.5-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Improvements to the cross-fading playback backend
+    - Assorted bug fixed for MTP device support
+    - Add "shuffle playlist" command for playlists
+    - Improvements to iPod art and podcast support
+    - Fix some issues causing problems for accessability tools
+    - Several major improvements to UPnP support 
+    - List Rhythmbox as supporting lastfm:// URIs
+  * debian/patches/80_from_bugzilla_use_gio_trash.patch:
+    - dropped, fixed in the new version
+  * debian/patches/90_from_svn_fix_audioscrobbler_issue.patch:
+    - change from svn, fix audioscrobbler issue
+  * debian/patches/91_from_svn_fix_eject_crasher.patch:
+    - change from svn, fix eject crasher 
+
+ -- Sebastien Bacher <seb128@canonical.com>  Sat, 22 Mar 2008 19:34:25 +0100
+
+rhythmbox (0.11.4.90-0ubuntu1) hardy; urgency=low
+
+  * New upstream version
+  * debian/patches/01_install_podcast_xul1.9.patch:
+    - renamed and updated
+  * debian/patches/01_lpi.patch,
+    debian/patches/02_autoconf.patch,
+    debian/patches/80_browser_by_default.patch:
+    - new version update
+  * debian/patches/03_fix_segfault_in_rb_metadata_get_missing_plugins.patch,
+    debian/patches/81_from_redhat_use_new_libsoup_version.patch,
+    debian/patches/82_from_bugzilla_use_new_key_naming.patch,
+    debian/patches/90_from_svn_ipod_copy_whole_album_artwork.patch,
+    debian/patches/90_from_svn_use_new_nautilus_mimetypes.patch:
+    - dropped, the changes are in the new version
+  * debian/patches/80_from_bugzilla_use_gio_trash.patch:
+    - change from bugzilla to use the gio trash
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 28 Feb 2008 22:44:33 +0100
+
+rhythmbox (0.11.4-0ubuntu6) hardy; urgency=low
+
+  * build-depend on xulrunner-1.9-dev
+    - update debian/control
+    - update debian/control.in
+  * use --with-gecko=mozilla to use mozilla-plugin.pc shipped by
+    xulrunner-1.9-dev
+    - update debian/rules
+  * install podcast plugin to /usr/lib/xulrunner-addons/plugins/
+    - add debian/patches/91_install_podcast_xul1.9.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 15 Feb 2008 00:13:47 +0100
+
+rhythmbox (0.11.4-0ubuntu5) hardy; urgency=low
+
+  * debian/control.in:
+    - updated libsoup build-depends so it uses the new version
+  * debian/patches/90_from_svn_use_new_nautilus_mimetypes.patch:
+    - change from SVN, use the new nautilus mimetypes so rhythmbox is listed
+      as a music and audio CD player in the nautilus media dialog (lp: #191475) 
+  * debian/patches/90_from_svn_ipod_copy_whole_album_artwork.patch:
+    - change from SVN, copy the whole ipod album artwork
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 13 Feb 2008 15:46:20 +0100
+
+rhythmbox (0.11.4-0ubuntu4) hardy; urgency=low
+
+  * debian/control.in:
+    - recommends on python-coherence (LP: #160592)
+    - use the new libsoup version
+  * debian/patches/81_from_redhat_use_new_libsoup_version.patch:
+    - change from redhat, update the code to the new libsoup version
+  * debian/patches/82_from_bugzilla_use_new_key_naming.patch:
+    - change from bugzilla to get multimedia key working (LP: #188702)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 06 Feb 2008 18:49:12 +0100
+
+rhythmbox (0.11.4-0ubuntu3) hardy; urgency=low
+
+  * debian/patches/80_browser_by_default.patch:
+    - patch from Mirco Mueller, "enable browser for all sources by default"
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 31 Jan 2008 16:20:45 +0100
+
+rhythmbox (0.11.4-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/03_fix_segfault_in_rb_metadata_get_missing_plugins.patch:
+    - Cherry pick fix from SVN to fix segfault in
+      rb_metadata_get_missing_plugins (LP: #178249).
+
+ -- Soren Hansen <soren@ubuntu.com>  Wed, 09 Jan 2008 12:48:47 +0100
+
+rhythmbox (0.11.4-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Support automatic GStreamer plugin installation (LP: #37671)
+    - Improved cross-fading backend
+    - Improved Podcast feed support, including Atom and APML (LP: #114846)
+    - Add optional mozilla plugin to handle itms:// links
+    - Fade volume when pausing and unpausing
+    - Improve performance and stability of MTP device support (LP: #163609)
+    - Stop putting deleted tracks on iPods in the Garbage Bin
+    - Support PSPs with newer firmware
+    - Improvements to the Coherence-based UPnP support
+    - Minor improvements to Python bindings for plugins
+  * debian/control.in:
+    - Build-Depends on firefox-dev for the itunes browser plugin
+    - updated totem-plparser and gstreamer requirements
+  * debian/patches/06_oggradios.patch:
+    - move the patch to the debian directory so it's not applied,
+      upstream commited the change to SVN but that's likely an error
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 21 Dec 2007 15:30:03 +0100
+
+rhythmbox (0.11.3-0ubuntu4) hardy; urgency=low
+
+  * No change upload for libmtp6 -> libmtp7 transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 04 Dec 2007 14:09:21 +0000
+
+rhythmbox (0.11.3-0ubuntu3) hardy; urgency=low
+
+  * Rebuild to use the new libgpod soname
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 28 Nov 2007 23:35:45 +0100
+
+rhythmbox (0.11.3-0ubuntu2) hardy; urgency=low
+
+  * Rebuild to use the new libtotem-plparser soname
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 27 Nov 2007 14:26:15 +0100
+
+rhythmbox (0.11.3-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Allow drag-and-drop of images to the cover art display
+    - Allow DAAP shares to be connected to manually
+    - Support DAAP smart playlists and radio streams
+    - Handle file name being passed on the command line again (LP: #18735)
+    - Add "donate to artist" action to Jamendo plugin
+    - Support some more lyric sites
+    - Improvements and fixes to the cross-fading player
+    - Improve UPnP support
+    - Improve track importing, especially on generic audio players
+    - Allow python plugins to use threads
+    - Enable music store plugins by default
+    - Support playback from fm radio tuner cards
+    - Other bug fixes (LP: #114726, #123470)
+  * Sync with Debian
+  * debian/control.in:
+    - add python-louie Recommends
+    - Build-Depends on python-gst0.10, liblaunchpad-integration-dev, 
+      linux-libc-dev
+    - updated python-support version to 0.5.6
+    - updated libnotify requirement
+    - updated python version to 2.5
+  * debian/patches/01_lpi.patch,
+    debian/patches/02_autoconf.patch:
+    - patches for launchpad-integration
+  * debian/patches/06_oggradios.patch:
+    - list only ogg stations by default
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 12 Nov 2007 12:59:47 +0100
+
+rhythmbox (0.11.2-1) experimental; urgency=low
+
+  [ Norbert Tretkowski ]
+  * New upstream development release.
+  * Versioned dependency on python-gnome2; closes: #436719.
+
+  [ Sven Arvidsson ]
+  * Update man page for rythmbox-client.
+
+  [ Loic Minier ]
+  * Only recommend gstreamer0.10-plugins-ugly; closes: #436736.
+
+ -- Norbert Tretkowski <nobse@debian.org>  Sat, 13 Oct 2007 14:17:51 +0200
+
+rhythmbox (0.11.1-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Document the need for gstreamer0.10-plugins-bad to play mms:// web radios
+    and suggest the package; thanks Alexis Bezverkhyy; closes: #429991.
+  * New upstream development release.
+    - Add a libmtp-dev build-dep for MTP support.
+    - Drop patches 80_from_bugzilla_fix_crash_on_eject,
+      81_from_bugzilla_fix_unknown_tags,
+      and 81_from_bugzilla_process_pending_events, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 26 Jun 2007 16:28:06 +0200
+
+rhythmbox (0.11.0-1) experimental; urgency=low
+
+  * New upstream development series; use at your own risk.
+    - Target at experimental; include check-dist.
+    - Bump up build-deps to libgtk2.0-dev >= 2.8.0, libgnomevfs2-dev >= 2.8.0,
+      libgstreamer0.10-dev >= 0.10.11, libgstreamer-plugins-base0.10-dev
+      >= 0.10.4, libglib2.0-dev >= 2.13.0.
+    - Add vala support to TODO.
+    - Search now ignores diacritics; closes: #425806.
+  * Build-depend on python-gtk2-dev >= 2.10 and python-gtk2 >= 2.10;
+    closes: #427056.
+  * New patch, 80_from_bugzilla_fix_crash_on_eject, fixes crash on iPod eject;
+    Ubuntu #117724; found in the Ubuntu package.
+  * New patch, 81_from_bugzilla_fix_unknown_tags, fixes songs having "Unknown"
+    tags when both ID3v1 and ID3v2 tags exist with possible trailing
+    whitespace; GNOME #442792; found in the Ubuntu package.
+  * New patch, 81_from_bugzilla_process_pending_events, process pending events
+    so that tags aren't randomly ignored, complements
+    81_from_bugzilla_fix_unknown_tags; found in the Ubuntu package.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 19 Jun 2007 15:04:22 +0200
+
+rhythmbox (0.10.1-1) unstable; urgency=low
+
+  * Recommend libgnomevfs2-extra to fetch album art; thanks Tom Parker;
+    closes: #423830, #424753.
+  * New upstream stable release.
+  * Wrap build-deps and deps.
+  * Watch all stable versions in watch file.
+  * Misc cleanups.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 29 May 2007 14:08:14 +0200
+
+rhythmbox (0.10.0-3) unstable; urgency=low
+
+  [ Sven Arvidsson ]
+  * Add a -dbg package (Closes: #419891).
+    - Bump up build-dep of cdbs to >= 0.4.37.
+    - Let rhythmbox-dbg recommend the available GStreamer -dbg packages
+
+ -- Loic Minier <lool@dooz.org>  Sat, 12 May 2007 10:02:47 +0200
+
+rhythmbox (0.10.0-2) unstable; urgency=low
+
+  * Upload to unstable; closes: #423478.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 12 May 2007 09:53:42 +0200
+
+rhythmbox (0.10.0-1) experimental; urgency=low
+
+  * Fix 0.9.8-4 changelog entry.
+  * New upstream release.
+    - Drop patch 01_xoverlay-fix, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 04 Apr 2007 11:22:13 +0200
+
+rhythmbox (0.9.8-4) experimental; urgency=low
+
+  * Let rhythmbox recommend gnome-control-center >= 2.15.90 for
+    gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as
+    the bundled gnome-sound-properties is not aware of GStreamer profiles;
+    update README.Debian accordingly.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 23 Mar 2007 11:31:26 +0100
+
+rhythmbox (0.9.8-3) experimental; urgency=high
+
+  * Depend on gstreamer0.10-x, fixes segfault in the visualization plugin; 
+    closes: #414273.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 11 Mar 2007 18:51:49 +0100
+
+rhythmbox (0.9.8-2) experimental; urgency=low
+
+  * New patch, 01_xoverlay-fix,  to stop visualizer 
+    problems when no x overlay is found; from upstream r4915; 
+    thanks Jonathan Matthew (Closes: #414273)
+
+ -- Sven Arvidsson <sa@whiz.se>  Sat, 10 Mar 2007 21:35:15 +0100
+
+rhythmbox (0.9.8-1) experimental; urgency=low
+
+  * New upstream release; "Type slowly".
+    - Drop patch 10_gnome-power-manager-active-key, merged upstream.
+    - Drop patch 94_from-svn-fix-soup-headers, merged upstream.
+    - Delete *.la and *.a files for the new shared lib.
+    - Ship shlibs, but exclude plugins from shlibs generation.
+  * Don't overwrite DEB_INSTALL_MANPAGES_rhythmbox.
+  * Move man pages to rhythmbox.manpages.
+  * Drop obsolete clean rule.
+  * Bump up python-support build-dep to >= 0.5.3 and drop dh_python call.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 22 Feb 2007 14:39:46 +0100
+
+rhythmbox (0.9.7-2) experimental; urgency=low
+
+  [ Sven Arvidsson ]
+  * Merge 0.9.6-6.
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Merge final bits from 0.9.6-6.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 27 Jan 2007 09:36:29 +0100
+
+rhythmbox (0.9.7-1) experimental; urgency=low
+
+  * New upstream release, "I love Perth".
+    - Bump up libgpod-dev build-dep to >= 0.4.
+    - Drop patch 10_podcasts-with-html-mime-type, merged upstream.
+    - Drop patch 90_from_cvs_fix_crash_when_disconnecting_ipod, merged
+      upstream.
+    - Drop patch 91_from_cvs_fix_crasher_when_closing_while_playing_cd,
+      merged upstream.
+    - Drop patch 92_from_cvs_set_codeset_to_utf8, merged upstream.
+    - Drop patch 93_from_cvs_fix_crash_on_song_edition, merged upstream.
+    - New patch, 10_gnome-power-manager-active-key, fixes a copy-paste typo in
+      the GConf schema for the gnome-power-manager enable/disable key;
+      GNOME #387527.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 19 Dec 2006 15:36:05 +0100
+
+rhythmbox (0.9.6-6) unstable; urgency=low
+
+  [ Sven Arvidsson ]
+  * Update man page, add man page for rhythmbox-client
+    (Closes: #386372, #401638)
+  * Removed broken scripts, rb-print-playing.py and rb-set-rating.py.
+    Partly superseded by rhythmbox-client.
+  * Recommend notification-daemon (Closes: #381233)
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * New patch, 94_from-svn-fix-soup-headers, to fix call to
+    soup_headers_parse_response with libsoup 2.2.99; backported from upstream
+    r4760; thanks Jonathan Matthew; closes: #406688.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 27 Jan 2007 09:34:11 +0100
+
+rhythmbox (0.9.6-5) unstable; urgency=high
+
+  * Recommend hal; closes: #380503.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 17 Dec 2006 11:29:12 +0100
+
+rhythmbox (0.9.6-4) unstable; urgency=low
+
+  * Drop libhal-dev build-dep on kfreebsd and hurd; thanks Petr Salinger;
+    closes: #401601.
+
+ -- Loic Minier <lool@dooz.org>  Mon,  4 Dec 2006 21:25:27 +0100
+
+rhythmbox (0.9.6-3) unstable; urgency=low
+
+  * Depend on gnome-icon-theme; closes: #382529, #391769.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 25 Oct 2006 12:15:38 +0200
+
+rhythmbox (0.9.6-2) unstable; urgency=low
+
+  * Stop shipping *.a and *.la files of plugins.
+  * Recommend g-v-m for iPod support; document this in README.Debian.
+  * New patch, 90_from_cvs_fix_crash_when_disconnecting_ipod, fixes a crash
+    when disconnecting an iPod; from upstream; found in the Ubuntu package;
+    Ubuntu #63985.
+  * New patch, 91_from_cvs_fix_crasher_when_closing_while_playing_cd, fixes a
+    crash when closing Rhythmbox during CD playback; from CVS; found in the
+    Ubuntu package.
+  * New patch, 92_from_cvs_set_codeset_to_utf8, to force the charset of
+    GStreamer messages to UTF-8, fixes a crash; from CVS; found in the Ubuntu
+    package; GNOME #359083.
+  * New patch, 93_from_cvs_fix_crash_on_song_edition, fixes a crasher when
+    editing a song; from CVS; found in the Ubuntu package; GNOME #359083.
+  * New patch, 10_podcasts-with-html-mime-type, to accept parsing Postcasts
+    served as html as MIME type; thanks Matt Kraai; closes: 394961.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 24 Oct 2006 21:55:40 +0200
+
+rhythmbox (0.9.6-1) unstable; urgency=low
+
+  * New upstream release.
+    - Build-depend on libgnome-keyring-dev for gnome-keyring support of DAAP
+      shares.
+    - Drop --enable-tag-writing from configure args, it is now the default.
+    - Bump libnautilus-burn-dev build-dep to >= 2.14 to ensure most functions
+      are available.
+    - Bump python-gtk2-dev build-dep to >= 2.8.0.
+    - Depend on python-gnome2 for gnomevfs support in plugins.
+    - Drop patch 03_dbus0.9, merged upstream.
+    - Smarter about creating podcast file names; closes: #350802.
+    - HTTP proxy-related fixes/improvements; closes: #370751.
+    - Doesn't try to download an episode if it couldn't be parsed;
+      closes: #371868.
+  * Build-depend on cdbs >= 0.4.35 instead of calling dh_installmime manually.
+  * Leave the Rhythmbox Development Reference Manual in the gtk-doc canonical
+    location, and symlink to it instead.
+  * Bump Debhelper compatibility level to 5.
+  * Convert to new Python Policy.
+    - Build-depend on python-support (>= 0.4).
+    - Bump up Debhelper build-dep to 5.0.37.2.
+    - Set Python compatibility level to 2.
+    - Add XS-Python-Version with ">= 2.3".
+    - Add XB-Python-Version to rhythmbox.
+    - Call dh_pysupport and dh_python; pass /usr/lib/rhythmbox/plugins to
+      dh_pysupport.
+    - Depend on ${python:Depends}.
+    - Depend on python-gtk2.
+
+ -- Loic Minier <lool@dooz.org>  Sun,  1 Oct 2006 18:37:08 +0200
+
+rhythmbox (0.9.5-3) unstable; urgency=low
+
+  * New patch, 03_dbus0.9.patch, to use dbus_connection_close() instead of
+    dbus_connection_disconnect() which will be removed in dbus >= 0.90; thanks
+    Sebastian Dröge. (Closes: #385381)
+
+ -- Loic Minier <lool@dooz.org>  Thu, 31 Aug 2006 11:29:09 +0200
+
+rhythmbox (0.9.5-2) unstable; urgency=low
+
+  * Fix spelling of Podcasts, thanks mlind (feenix) and Sébastien Bacher.
+    (Ubuntu: #54336)
+
+ -- Loic Minier <lool@dooz.org>  Fri, 28 Jul 2006 14:39:48 +0200
+
+rhythmbox (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 22 Jun 2006 20:24:45 +0200
+
+rhythmbox (0.9.4.90-1) experimental; urgency=low
+
+  * New upstream pre-release of 0.9.5.
+    - Update James Livingston's email address.
+      [debian/copyright]
+    - Bump up libgtk2.0-dev build-dep to >= 2.6.0.
+      [debian/control, debian/control.in]
+    - Add a libgnome-media-dev (>= 2.8) build-dep for track transfer support.
+      [debian/control, debian/control.in]
+    - Drop libbonobo2-dev and liborbit2-dev build-deps.
+      [debian/control, debian/control.in]
+    - Don't configure with --enable-daap as this is now the default.
+      [debian/rules]
+    - Drop libnotify version checks patch, merged upstream.
+      [debian/patches/10_eggtrayicon-libnotify-version-checks.patch]
+    - Use local copies of the rb-print-playing.py and rb-set-rating.py samples
+      as they didn't end in the tarball.
+      [debian/rb-print-playing.py, debian/rb-set-rating.py,
+       debian/rhythmbox.install]
+
+ -- Loic Minier <lool@dooz.org>  Thu,  8 Jun 2006 08:36:56 +0200
+
+rhythmbox (0.9.4.1-6) unstable; urgency=low
+
+  * Ship Rhythmbox Development Reference Manual below /usr/share/doc/rhythmbox
+    instead of /usr/share/gtk-doc/html/rhythmbox. (Closes: #363143)
+    [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Mon, 22 May 2006 15:30:25 +0200
+
+rhythmbox (0.9.4.1-5) unstable; urgency=low
+
+  * Fix postinst to repair the scrollkeeper db only when scrollkeeper is
+    installed, hence do repair for upgrades from <= 0.9.4.1-5.
+    (Closes: #368279)
+    [debian/rhythmbox.postinst]
+
+ -- Loic Minier <lool@dooz.org>  Sun, 21 May 2006 10:29:28 +0200
+
+rhythmbox (0.9.4.1-4) unstable; urgency=low
+
+  * Recommend sound-juicer for audio CD ripping, thanks Jack.
+    (Closes: #367980)
+    [debian/control, debian/control.in]
+  * Rebuild against unstable's libsexy. (Closes: #368069)
+
+ -- Loic Minier <lool@dooz.org>  Fri, 19 May 2006 20:34:04 +0200
+
+rhythmbox (0.9.4.1-3) unstable; urgency=low
+
+  * Update description to mention Audio CD playback, Generic portable audio
+    player support, and Podcasts, thanks Sven Arvidsson. (Closes: #367035)
+    [debian/control, debian/control.in]
+  * Removed obsolete pipelines. (Closes: #367192)
+    [debian/README.Debian]
+  * Rebuild scrollkeeper database completely if upgrading from versions
+    >= 0.9.4.1-1 and < 0.9.4.1-3.
+    [debian/rhythmbox.postinst]
+  * New patch to take a CVS version of widgets/eggtrayicon.c and additional
+    libnotify version checks fixes. (Closes: #367713)
+    [debian/patches/10_eggtrayicon-libnotify-version-checks.patch]
+
+ -- Loic Minier <lool@dooz.org>  Thu, 18 May 2006 14:29:26 +0200
+
+rhythmbox (0.9.4.1-2) unstable; urgency=medium
+
+  * Disable scrollkeeper-update run in "make install" with configure's
+    --disable-scrollkeeper.
+    [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Sun,  7 May 2006 11:59:08 +0200
+
+rhythmbox (0.9.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump up Standards-Version to 3.7.2.
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Sat,  6 May 2006 17:03:17 +0200
+
+rhythmbox (0.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes handling of songs with "&" in tags. (Closes: #353226)
+    - Remembers window visibility between sessions. (Closes: #223257)
+    - New --no-update command-line flag to skip any check for changes on files
+      of the library. (Closes: #200586, #332584)
+    - Sorts automatic playlists. (Closes: #220481)
+    - Music sharing is now documented in the manual. (Closes: #355234)
+    - Goes to next song when you delete the current one. (Closes: #205976)
+    - Update address of Jonathan Matthew.
+      [debian/copyright]
+    - Pass --enable-lirc to configure.
+      [debian/rules]
+    - Document the need to bump up the nautilus-burn build-dep in later
+      uploads.
+      [debian/TODO]
+    - Build-depend on libsexy-dev (>= 0.1.5).
+      [debian/control, debian/control.in]
+    - Build-depend on python, python-gtk2-dev, python-dev.
+      [debian/control, debian/control.in]
+    - Build-depend on gnome-doc-utils (>= 0.3.2).
+      [debian/control, debian/control.in]
+  * Ship sample Python scripts to access Rhythmbox via dbus to retrieve things
+    like the name of the currently playing song. (Closes: #230302)
+    [debian/rhythmbox.install]
+  * Rework the description to mention sharing.
+    [debian/control, debian/control.in]
+  * Document the Avahi dependency in README.Debian.
+    [debian/README.Debian]
+
+ -- Loic Minier <lool@dooz.org>  Sun, 16 Apr 2006 18:33:44 +0200
+
+rhythmbox (0.9.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Sun,  5 Feb 2006 14:48:09 +0100
+
+rhythmbox (0.9.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix crashes with Ogg Vorbis and FLAC. (Closes: #348021)
+    - Shell invocations don't bring up the window. (Closes: #349686)
+    - Now offers links to last.fm instead of allmusic.com.
+      (Closes: #225088, #270245)
+    - Now saves the database every 5 minutes if dirty.
+      (Closes: #271215, #335785)
+    - Now restores the state of the window completely when de-iconifying.
+      (Closes: #301846)
+    - Add libnotify-dev >= 0.2.2 build-dep.
+      [debian/control, debian/control.in]
+    - Bump libgnomevfs2-dev build-dep to >= 2.7.4
+      [debian/control, debian/control.in]
+    - Bump libtotem-plparser-dev build-dep to >= 1.1.5.
+      [debian/control, debian/control.in]
+    - Add libglade2-dev build-dep.
+      [debian/control, debian/control.in]
+    - Drop useless --enable-ipod from DEB_CONFIGURE_EXTRA_FLAGS and comment
+      on the other flags.
+    - Switch to a GStreamer 0.10 sound-system.
+      . Should avoid gap between songs. (Closes: #293437)
+      . Should be faster to index new directories. (Closes: #320678)
+      . Drop GStreamer 0.8 build-deps.
+        [debian/control, debian/control.in]
+      . Add libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+        build-deps.
+        [debian/control, debian/control.in]
+      . Add gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base,
+        gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly,
+        libgstreamer0.10-0, and gstreamer0.10-alsa | gstreamer0.10-audiosink
+        deps to rhythmbox.
+        [debian/control, debian/control.in]
+      . Drop gstreamer0.8 deps for rhythmbox.
+        [debian/control, debian/control.in]
+    - Bump libavahi-client-dev and libavahi-glib-dev to >= 0.6.
+      [debian/control, debian/control.in]
+    - Add zlib1g-dev build-dep.
+      [debian/control, debian/control.in]
+    - Bump libmusicbrainz-dev build-dep to >= 2.1.0.
+      [debian/control, debian/control.in]
+    - Add libx11-dev build-dep but keep the libxt-dev build-dep for now.
+      [debian/control, debian/control.in]
+    - Add libglib2.0-dev build-dep for glib-genmarshal.
+      [debian/control, debian/control.in]
+    - Add gtk-doc-tools >= 1.4 build-dep.
+      [debian/control, debian/control.in]
+    - Drop obsolete DBus 0.60 patch (merged upstream).
+      [debian/patches/07_dbus060.patch]
+  * Downgrade the avahi-daemon dependency to a Recommends since Rhythmbox
+    now starts without any error dialog when avahi-daemon isn't running.
+    (Closes: #349478, #349533)
+    [debian/control, debian/control.in]
+  * Include full GPL block and full AUTHORS list.
+    [debian/copyright]
+  * Use HTTP in watch file.
+    [debian/watch]
+  * Misc doc updates.
+    [debian/rules, debian/README.Debian, debian/TODO]
+  * Drop obsolete NEWS file.
+    [debian/NEWS]
+
+ -- Loic Minier <lool@dooz.org>  Thu,  2 Feb 2006 22:22:18 +0100
+
+rhythmbox (0.9.2-3) unstable; urgency=low
+
+  * Depend on dbus, command-line invocations should work again, thanks Alexis
+    Papadopoulos and Sjoerd Simons. (Closes: #348168)
+    [debian/control, debian/control.in]
+  * Depend on avahi-daemon for DAAP music sharing.
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Mon, 16 Jan 2006 18:10:22 +0100
+
+rhythmbox (0.9.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Add libgpod-dev to build-depends to reenable iPod support
+    (closes: #346006). [debian/control.in]
+  * Update description. [debian/control.in]
+  * Make ALSA the default GStreamer audiosink. [debian/control.in]
+
+ -- Jordi Mallach <jordi@debian.org>  Tue, 10 Jan 2006 21:11:18 +0100
+
+rhythmbox (0.9.2-1) experimental; urgency=low
+
+  * New upstream version:
+    - Add podcast support
+    - Podcast fixes and improvements
+    - Add support for audioscrobbler/last.fm submission
+    - Add audio CD support
+    - Use libgpod, add support for ipod playlists
+    - Make more strings translatable
+    - Stop when reaching end of playlist in linear mode
+    - Fix lots of window-state weirdness
+    - Remember window position
+    - Fix memory leaks
+    - Make hidden/shown window policy better
+    - DBus interface improvements
+    - Use natural sorting order
+    - Fix "show window" in tray icon menu to toggle correctly
+    - Don't share hidden tracks with DAAP
+    - Make connecting to DAAP shares asynchronous
+    - Make DAAP work on 64 bit systems
+    - Make tag-writing safer
+    - Fix memory leaks 
+    - Make default stations actually show up
+    - Make dragging playlists copy not move files
+    - Fix re-ordering problems
+    - Save the database regularly
+    - Show disc number in info window
+    - UI and HIG fixes
+    - Allow search box to match multiple properties
+    - Report iradio errors better
+    - Make date formats correct in all locales
+    - Fix drag-and-drop of URLs
+    - Mork better with autofs mounts
+    - Don't wedge gnome-vfs-daemon
+    - Use chunked loading/sending of daap files
+    - Allow Anjuta to import the source tree
+    - Add support for year/date metadata
+    - Display errors in the radio properties
+    - Add file-overwrite dialogs for GTK 2.8
+    - Add "Edit Playlist" item to main menu
+    - Make new radio station use the properties dialog
+    - Display the count in the "All" line of browsers
+    - Fix query-model refcount and polling problems
+    - Fix emission of entry-changed signals on startip
+    - Support gzip encoded DAAP
+    - Allow pause by middle-clicking on the tray icon
+    - Start some RhythmDB API docs
+    - Don't display error if Avahi daemon isn't running
+    - Emit single "icon missing" warning
+    - Store the bitrate for radio streams
+    - Bring back per-source search box text
+    - GObject-ify rb-daap-connection.c
+    - Make disabling and re-enabling daap work
+    - Give playlists and entry-type
+    - Use g_list_prepend to make things not O(n^2)
+    - Don't hang with broken DAAP servers
+    - Update quick-reference to have right keys
+    - Fix libsoup tests for DAAP
+    - Don't have date-added column for cds and ipods
+    - Support Avahi 0.6
+    - Disable saving, renaming, and deletion of DAAP playlists
+    - Assorted other bug fixes
+    - Disable the close button's minimise-to-tray action
+    - Fix the window parameter storage when using the notify (Ubuntu: #1657).
+    - Fix the scaling of the side pane (Ubuntu: #15048).
+    - Fix the sorting by genre (Ubuntu: #19815).
+  * debian/control.in:
+    - Build-Depends on libmusicbrainz4-dev
+    - doesn't Build-Depends on dbus-1-utils
+    - build with dbus 0.60
+  * debian/patches/07_dbus060.patch:
+    - patch for dbus 0.60
+  * debian/rules:
+    - build with tag writing (it does id3/flac changes at the moment)
+
+  [ Loic Minier ]
+  * Update watch file.
+  * Don't depend on avahi-daemon. (Closes: #343051)
+  
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 19 Dec 2005 00:48:21 +0100
+
+rhythmbox (0.9.1-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Fix and update GStreamer pipelines suggested to debug Rhythmbox.
+    (Closes: #329213) [debian/README.Debian]
+  * Update audiosink configuration information. [debian/README.Debian]
+  
+  [ Sebastien Bacher ]
+  * New upstream version:
+    - Add DAAP (iTunes' music sharing) support.
+    - Notification bubble from tray icon.
+    - Minimise to tray rather than exiting when close is used.
+    - Allow sources to form a tree, for child playlists.
+    - Add removable media framework and port ipod code.
+    - Support HAL >= 0.5 as well as > 0.2.
+    - Much improved automatic playlists, including more criteria options and
+      sorting.
+    - Use a proper GTK status bar.
+    - Better drag-n-drop support: drag from browsers to source list, 
+      from browsers or track list to other apps and re-order playlists.
+    - Update DBus support to version 0.35, general DBUS improvements and drop
+      command-line arguments for DBus.
+    - Add "limit by time" option to playlists.
+    - Display hours if a song is longer than 60 minutes.
+    - Use new volume widget, same as in Totem.
+    - Focus entry view when enter is pressed in search box.
+    - Show source list when playlist os created.
+    - Disable rather then hide seek bar.
+    - Improved error handling in RBPlayer.
+    - Remove dashboard support.
+    - Many HIG and UI improvements.
+    - Use last.fm instead of allofmusic.com for links.
+    - Remove autorating of tracks.
+    - Fix header synchronisation.
+    - Fix some window state issues.
+    - Add "Date Added" column.
+    - Better playlist loading.
+    - Make playing source bold, rather than using an icon.
+    - Allow library-derived sources to override behaviour.
+    - Correctly update status bar and don't use useless info.
+    - Add support for building API docs with gnome-doc-utils.
+    - Update the default radio stations.
+    - Remove a heap of old code, and use stock art instead of custom art.
+    - Many rhythmdb improvements.
+    - Fix more memory leaks.
+    - Many bug fixes and minor improvements.
+    - Updated Translations.
+  * debian/control.in:
+    - build with the new dbus/hal versions (Closes: #333362).
+  * debian/control.in, debian/rules:
+    - build with the daap option.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 17 Oct 2005 19:35:51 +0200
+
+rhythmbox (0.9.0-2) experimental; urgency=medium
+
+  * Bump totem build-dep to catch the shlib-deps. (Closes: #327460)
+
+ -- Loic Minier <lool@dooz.org>  Sun, 11 Sep 2005 12:14:39 +0200
+
+rhythmbox (0.9.0-1) experimental; urgency=low
+
+  * New upstream release.
+    - Bump libgtk2.0-dev, libgnomevfs2-dev, dbus-glib-1-dev,
+      libgstreamer0.8-dev, libgstreamer-plugins0.8-dev,
+      libgstreamer-gconf0.8-dev build-deps.
+      [debian/control, debian/control.in]
+    - Add libnautilus-burn-dev, libhal-dev, libtotem-plparser-dev, pkg-config,
+      liblircclient-dev, libbonobo2-dev, liborbit2-dev build-deps.
+      [debian/control, debian/control.in]
+    - Drop obsolete patches. [debian/patches/02_patch-134_ipod-crash.patch,
+      debian/patches/03_patch-135_utf-8-filenames.patch,
+      debian/patches/04_patch-136_musepack-wma-support.patch,
+      debian/patches/05_patch-137-song-rating.patch,
+      debian/patches/20_bugzilla-attach-38781_ipod-gnomevfsvolumemonitor-hal-support.patch,
+      debian/patches/21_re-autotools.patch,
+      debian/patches/30_bugzilla-attach-39194_fix-null-mountpoint.patch,
+      debian/patches/40_debian_geometry_hints.patch,
+      debian/patches/50_debian_xmlsaveformatfile_check.patch]
+    - Doesn't loop forever when parsing radio streams. (Closes: #278761)
+    - Column sorting works. (Closes: #294605, #315511)
+    - New ^Y keybinding to clear the search text. (Closes: #211720)
+    - Doesn't drop files from the DB if a network share isn't mounted.
+      (Closes: #287072)
+    - Xine backend has been dropped upstream. (Closes: #225883, #255817)
+    - Shows date in song properties. (Closes: #274407)
+  * Switch DEB_CONFIGURE_EXTRA_FLAGS to a "+=" and add a comment on building
+    with tag writing support. [debian/rules]
+  * Bump Standards-Version to 3.6.2. [debian/copyright]
+  * Drop xine TODO item. [debian/TODO]
+  * Add CDBS' utils. [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Tue,  6 Sep 2005 10:35:16 +0200
+
+rhythmbox (0.8.8-13) unstable; urgency=high
+
+  * urgency high for Sarge targetted RC bugfix
+  * check the return code of xmlSaveFormatFile when saving playlists, fixes
+    data loss when disk is full (closes: #309119).  Thanks to Robert McQueen.
+    [debian/patches/50_debian_xmlsaveformatfile_check.patch]
+  * fix a bug introduced with the 40_debian_geometry_hints patch where one
+    couldn't resize the small version of the GUI (closes: #257838)
+    [debian/patches/40_debian_geometry_hints.patch]
+
+ -- Loic Minier <lool@dooz.org>  Sun, 15 May 2005 20:42:12 +0200
+
+rhythmbox (0.8.8-12) unstable; urgency=low
+
+  * debian/patches/40_debian_geometry_hints.patch: new patch to fix the
+    probably wrong 0 max_height geometry hint, interpreted strangely by
+    different windows managers
+
+ -- Loic Minier <lool@dooz.org>  Sun,  8 May 2005 10:02:40 +0200
+
+rhythmbox (0.8.8-11) unstable; urgency=low
+
+  * debian/patches/\
+      20_bugzilla-attach-38781_ipod-gnomevfsvolumemonitor-hal-support.patch:
+    new patch from upstream to detect the mount point of iPod devices.  This
+    means there's no more hardcoded iPod mount point, and we "comply" with FHS
+    (closes: #298915)
+  * Add a dbus-glib-1-dev build-dep for HAL support.
+  * debian/patches/21_re-autotools.patch: re-configure and re-autoheader with
+    newer configure.ac
+  * debian/patches/30_bugzilla-attach-39194_fix-null-mountpoint.patch: new
+    patch from upstream to fix a crash when mountpoint is NULL (probably
+    caused by blank CD in drive)
+
+ -- Loic Minier <lool@dooz.org>  Thu, 24 Mar 2005 14:11:36 +0100
+
+rhythmbox (0.8.8-6) unstable; urgency=high
+
+  * urgency high because of RC bug fix
+  * build-depend on libgnomeui-dev (>= 2.8.1-3) to get rif of the libhowl
+    dependency (closes: #298870) (that's enough to get a good libgnomevfs2
+    dep)
+
+ -- Loic Minier <lool@dooz.org>  Sat, 12 Mar 2005 15:43:19 +0100
+
+rhythmbox (0.8.8-5) unstable; urgency=low
+
+  * debian/patches/00_relibtoolize.patch: dropped (useless)
+
+ -- Loic Minier <lool@dooz.org>  Sun, 30 Jan 2005 14:10:10 +0100
+
+rhythmbox (0.8.8-4) unstable; urgency=low
+
+  * debian/patches:
+    - removed 01_keep-playing-state.patch (closes: #292509)
+      (reopens: #218262)
+    - added 00_relibtoolize.patch (libtoolize --force && aclocal-1.7 &&
+      autoconf && rm -rf autom4te.cache)
+
+ -- Loic Minier <lool@dooz.org>  Sat, 29 Jan 2005 19:51:34 +0100
+
+rhythmbox (0.8.8-3) unstable; urgency=low
+
+  * control:
+    . we do need libgstreamer-plugins0.8-dev
+    . we only need libxml-parser-perl, and not intltool
+
+ -- Loic Minier <lool@dooz.org>  Wed, 26 Jan 2005 18:54:10 +0100
+
+rhythmbox (0.8.8-2) unstable; urgency=low
+
+  * build with iPod support! (closes: #277678)
+  * patches:
+      . 01_keep-playing-state.patch: patch from upstream BTS to stay in
+        paused mode when pressing next or previous (closes: #218262)
+      . 02_patch-134_ipod-crash.patch: prevent crash when iPod is connected
+      . 03_patch-135_utf-8-filenames.patch: better handling of utf-8 and
+        non-utf-8 filenames
+      . 04_patch-136_musepack-wma-support.patch: musepack and wma support
+      . 05_patch-137-song-rating.patch: song rating fix
+  * updated notes in README.Debian
+  * corrected copyright file
+  * added TODO.Debian with a short list of small things that could done
+  * new rhythmbox.xpm (Gimp's output is really nicer)
+  * control:
+    . removed libpanel-applet2-dev libgstreamer-plugins0.8-dev, libflac-dev,
+      libvorbis-dev, and libmusicbrainz2-dev Build-Depends (not used)
+    . removed esound Recommends
+    . removed vorbis-tools Depends
+    . moved scrollkeeper and yelp to Recommends
+    . added debhelper's misc:deps
+    . updated CDBS vresionned build-deps to ensure we have dh_desktop
+    . changed libxml-parser-perl Depends in favor of intltool (>= 0.28-2)
+  * rhythmbox.postinst: removed
+
+ -- Loic Minier <lool@dooz.org>  Tue, 25 Jan 2005 10:04:52 +0100
+
+rhythmbox (0.8.8-1) unstable; urgency=low
+
+  * New upstream release:
+    - flip playing icon in RTL locale.
+    - don't include x-directory/normal in MimeType.
+    - save playlists after first start even if nothing's loaded.
+    - don't include nautilus menu item by default. (Closes: #260317)
+  * rhythmbox.menu: remove trailing space (Closes: #262427)
+  * rules:
+    - add DEB_DH_MAKESHLIBS_ARGS_rhythmbox to workaround #204975
+    - remove debugging CFLAGS
+  * added rhythmbox.xpm (convert'ed from upstream's rhythmbox.png) and
+    rhythmbox.install to provide an ugly icon in the menu
+  * set myself as Maintainer
+  * Updated notes in README.Debian (Closes: #265167)
+
+ -- Loic Minier <lool@dooz.org>  Tue, 12 Oct 2004 23:56:37 +0200
+
+rhythmbox (0.8.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 30 Sep 2004 01:44:27 +0200
+
+rhythmbox (0.8.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * rhythmbox.postinst:
+    - register the desktop file in the database for the new mime system.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 18 Sep 2004 23:09:19 +0200
+
+rhythmbox (0.8.5-3) unstable; urgency=low
+
+  * debian/rhythmbox.postinst, debian/rhythmbox.postrm:
+    - removed, dh_gconf and dh_scrollkeeper handle that.
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri,  6 Aug 2004 20:41:15 +0000
+
+rhythmbox (0.8.5-2) unstable; urgency=low
+
+  * debian/NEWS: fix typos (closes: #263203).
+  * rebuild against libgnutls11 (closes: #263676).
+  * debian/control.in: build-depend on libgnomeui 2.6.1.1-4 to enforce the
+    libgnutls11 dependency.
+
+ -- Josselin Mouette <joss@debian.org>  Thu,  5 Aug 2004 16:47:49 +0200
+
+rhythmbox (0.8.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rhythmbox.mime:
+    - register with the MIME system (Closes: #255905).
+  * debian/patches/lirc.patch:
+    - removed the patch for the lirc support since apparently it doesn't work.
+  
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 24 Jun 2004 12:47:00 +0200
+
+rhythmbox (0.8.4-6) unstable; urgency=low
+
+  * debian/control.in:
+    - depends on gstreamer0.8-flac (Closes: #250584).
+  * debian/rhythmbox.menu:
+    - added an icon (Closes: #252844).
+  * debian/patches/lirc.patch:
+    - patch from Jon Oberheide <jon@focalhost.com> to reactivate the lirc
+      support (Closes: #246422).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 11 Jun 2004 18:37:33 +0200
+
+rhythmbox (0.8.4-5) unstable; urgency=low
+
+  * Rebuilt with gtk+2.4 to use the new fileselector (Closes: #252827).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  6 Jun 2004 02:47:40 +0200
+
+rhythmbox (0.8.4-4) unstable; urgency=low
+
+  * debian/control.in:
+    + really fix audiosink problem.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 23 May 2004 21:36:32 +0200
+
+rhythmbox (0.8.4-3) unstable; urgency=low
+
+  * debian/control.in:
+    + use gstreamer0.8-audiosink for Depends (Closes: #250433).
+  * included NEWS file from Martin-Eric Racine <q-funk@pp.fishpool.fi>.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 23 May 2004 03:07:11 +0200
+
+rhythmbox (0.8.4-2) unstable; urgency=low
+
+  * Upload to unstable since the new branch works fine.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 22 May 2004 01:51:46 +0200
+
+rhythmbox (0.8.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 19 May 2004 00:00:12 +0200
+
+rhythmbox (0.8.3-2) experimental; urgency=low
+
+  * Upload in experimental since gstreamer 0.8 is in the archive now.
+    + officially close bugs marked as fixed in previous changelog entries
+      (Closes: #243408, #245839, #244144, #229361, #235110, #220213, #229710)
+      (Closes: #228474, #225183, #237048, #244340, #247167).
+  * debian/control.in:
+    + added Build-Depends on libxt-dev and libxml-parser-perl.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 17 May 2004 18:53:07 +0200
+
+rhythmbox (0.8.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue,  4 May 2004 22:24:23 +0200
+
+rhythmbox (0.8.2-1) experimental; urgency=low
+
+  * New upstream release.
+    + don't crash when the GConf schema isn't properly installed
+      (Closes: #243408).
+  * debian/control.in:
+    + removed Build-depends on libid3tag0-dev (Closes: #245839).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  1 May 2004 12:51:43 +0200
+
+rhythmbox (0.8.1-1) experimental; urgency=low
+
+  * New upstream release
+    + find iradio-initial.pls correctly (Closes: #244144).
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 20 Apr 2004 22:54:33 +0200
+
+rhythmbox (0.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+    + save database and playlists while running (Closes: #229361, #235110).
+    + magnatune radio is in default list (Closes: #220213).
+    + update shuffle checkbox on changes (Closes: #229710).
+  * Added manpage from Max Vozeler <max@hinterhof.net> (Closes: 228474).
+  * debian/control.in:
+    + updated Build-Depends on libid3tag0-dev to >= 0.15.0b 
+      (Closes: #225183, #237048).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 16 Apr 2004 22:25:19 +0200
+
+rhythmbox (0.7.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 12 Apr 2004 19:33:13 +0200
+
+rhythmbox (0.6.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #241166).
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 31 Mar 2004 19:38:10 +0200
+
+rhythmbox (0.6.8-1) unstable; urgency=low
+
+  * New upstream release:
+    + Save library even after first time Rhythmbox runs 
+      (Closes: #235818,  #235823).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  6 Mar 2004 12:40:54 +0100
+
+rhythmbox (0.6.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    + Removed the workaround, the schemas installation is fixed in this version.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 28 Feb 2004 11:56:07 +0100
+
+rhythmbox (0.6.6-1) unstable; urgency=low
+
+  * New upstream release:
+    + Keep current selection on right-click (Closes: #211575).
+  * debian/control.in:
+    + Suggests yelp (Closes: #227263).
+    + Updated Buil-Depends on debhelper to 4.1.87 for dh_gconf 
+      (Closes: #230861).  
+  * debian/README.Debian:
+    + Added a note on list conversions of files between 0.5 and 0.6 versions
+      (Closes: #227501).
+  * debian/patches/rb-m3u-playlists.patch:
+    + Removed since the fix is included in the new version.
+  * debian/rules:
+    + Workaround for the wrong schemas installation dir.
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 27 Feb 2004 22:35:39 +0100
+
+rhythmbox (0.6.5-2) unstable; urgency=low
+
+  * debian/patches/rb-m3u-playlists.patch:
+    + New patch to fix m3u playlists loading (Closes: #229481).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  1 Feb 2004 00:47:56 +0100
+
+rhythmbox (0.6.5-1) unstable; urgency=low
+
+  * New upstream release:
+    + Work with session management (Closes: #223257).
+    + Fix length calculation for some VBR MP3s (Closes: #224456).
+    + Fix volume popup near bottom of screen (Closes: #213257).    
+  * debian/README.Debian:
+    + Updated to add a note on gstreamer-properties usage to change audio sink
+      (Closes: #229023).
+  
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 22 Jan 2004 19:36:22 +0100
+
+rhythmbox (0.6.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Colin Walters <walters@debian.org>  Mon, 12 Jan 2004 08:16:39 +0000
+
+rhythmbox (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+    + Use better algorithms for Shuffle (Closes: #206407).
+    + Fix length parsing from variable-bitrate MP3s (Closes: #224456).
+  * debian/patches/00docs-fix.patch: 
+    + Removed since the changes are include in the new version.     
+  * debian/patches/01docs-fix-autogen.patch: 
+    + Removed since the changes are include in the new version.  
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 22 Dec 2003 20:40:58 +0100
+
+rhythmbox (0.6.1-2) unstable; urgency=low
+
+  * 00docs-fix.patch: patch from Jordi Mallach to make the XML correct
+    (closes: #223538, #223802).
+  * 01docs-fix-autogen.patch: patch Makefile.in as well.
+  * rules:
+    + use simple-patchsys.mk to apply the patches.
+    + clean help/C/authors.xml to force its rebuild.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 12 Dec 2003 20:50:18 +0100
+
+rhythmbox (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  4 Dec 2003 21:53:28 +0100
+
+rhythmbox (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fix the launching from nautilus (Closes: #218715).
+    + Keep a playback history (Closes: #218264).
+    + Don't crash on a song removal (Closes: #207073).
+  * debian/control:
+    + Set GNOME Team as maintainer (thanks Colin).
+    + Updated Standards-Version to 3.6.1.0.
+  * debian/patches:
+    + keycodes.patch: removed.
+  * debian/rules:
+    + Updated for the GNOME Team maintenance.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 11 Nov 2003 22:02:23 +0100
+
+rhythmbox (0.5.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Colin Walters <walters@debian.org>  Mon, 27 Oct 2003 17:19:42 -0500
+
+rhythmbox (0.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Colin Walters <walters@debian.org>  Thu,  4 Sep 2003 23:43:28 -0400
+
+rhythmbox (0.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Colin Walters <walters@debian.org>  Tue, 26 Aug 2003 23:50:22 -0400
+
+rhythmbox (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes multimedia keycodes grabbing (Closes: #206010)
+
+ -- Colin Walters <walters@debian.org>  Mon, 18 Aug 2003 18:34:37 -0400
+
+rhythmbox (0.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Kills off old copied getline stuff, which had size_t issues
+      (Closes: #205849)
+
+ -- Colin Walters <walters@debian.org>  Sat, 16 Aug 2003 23:13:40 -0400
+
+rhythmbox (0.4.99.5-1) unstable; urgency=low
+
+  * New upstream prerelease (Closes: #204115)
+
+    Sorry Debian Unstable users, you're my guinea pigs.  This is
+    a prerelease.  It does however fix a near-infinite number of bugs,
+    some of which you can see below.  So overall, I doubt anyone
+    would want to stay with the old package.  If you don't like this,
+    please don't file bugs.  Instead, you will have to fork a copy
+    of net-rhythmbox yourself.
+
+    Now, since this is a prerelease - I am interested in bug reports.
+    You may file bugs in the Debian Bug Tracking System, but I would
+    much prefer that you file them in the upstream Bugzilla:
+    http://bugzilla.gnome.org/
+
+    However, it does break compatibility with the old library cache
+    format; you will have to re-add all of your files to the library.  The
+    upstream author is kind of a lazy bastard, and doesn't really have
+    time to write transition scripts (which would be quite difficult
+    anyways).  Sorry about that.
+  
+    - Rhythmbox follows links, this is intentional (Closes: #169488)
+    - Alphabetical sorting is fixed (Closes: #172089)
+    - Playlist saving is more reliable (Closes: #182815)
+    - Tray icon recreates itself (Closes: #192557)
+    - Setting properties on iradio stations works (Closes: #193686)
+    - Control-J is consistent with menu item (Closes: #173634)
+    - Groks .m3u files (Closes: #182596)
+    - GStreamer threading is more reliable (Closes: #178283)
+    - Shuffling code is refactored, should not hang (Closes: #192556)
+    - Playing files with : in name works (Closes: #188511)
+    - Repeat in single-song playlists works (Closes: #188477)
+
+ -- Colin Walters <walters@debian.org>  Fri, 15 Aug 2003 21:31:23 -0400
+
+rhythmbox (0.4.8-5) unstable; urgency=low
+
+  * debian/control:
+    - Remove Build-Depends on libgstreamer-core-libs-dev.
+    - Remove Depends on gstreamer-core.
+    - Build-Depend on the latest libgstreamer0.6-dev.
+    - Build-Depend on the latest cdbs.
+  
+ -- Colin Walters <walters@debian.org>  Sat,  7 Jun 2003 01:47:20 -0400
+
+rhythmbox (0.4.8-4) unstable; urgency=low
+
+  * debian/control:
+    - Bump Standards-Version: 3.5.10, no changes required.
+    - Build-Depend on cdbs.
+    - Remove Build-Depends on xlibs-pic, now that libxosd2-dev has
+      picked it up.
+    - Change Section to gnome.
+  * debian/rules:
+    - Convert to cdbs.
+  * debian/rocks:
+    - Removed.
+
+ -- Colin Walters <walters@debian.org>  Sun, 25 May 2003 05:08:35 -0400
+
+rhythmbox (0.4.8-3) unstable; urgency=low
+
+  * The "Pfizer Launches 'Zoloft For Everything' Ad Campaign" release.
+  * debian/control:
+    - Add Build-Depends on xlibs-pic; this should make the powerpc buildd
+    happy.
+
+ -- Colin Walters <walters@debian.org>  Wed, 14 May 2003 16:34:01 -0400
+
+rhythmbox (0.4.8-2) unstable; urgency=low
+
+  * The "Dozens Dead In Chicago-Area Meatwave" release.
+  * debian/control:
+    - Add Build-Depends on xlibs-pic (Closes: #192561).
+  * debian/patches/getline-ssizet.patch:
+    - New patch, should fix build failures on ia64 and alpha.
+
+ -- Colin Walters <walters@debian.org>  Sat, 10 May 2003 00:10:36 -0400
+
+rhythmbox (0.4.8-1) unstable; urgency=low
+
+  * The "Bush To Lovely Chilean Ambassador: 'I Must Paint You'" release.
+  * New upstream release.
+    - Really restore shuffle state (Closes: #188951)
+  * debian/control:
+    - Bump Build-Depends on musicbrainz to 2.0.0.
+    - Bump Build-Depends on gstreamer to 0.6.1.
+    - Standards-Version: 3.5.9, no changes required.
+    - Update description.
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Wed,  7 May 2003 15:07:35 -0400
+
+rhythmbox (0.4.6-1) unstable; urgency=low
+
+  * The "Marilyn Manson Now Going Door-To-Door Trying To Shock People"
+    release.
+  * If this release fixes one of the bugs you reported, please close it!
+  * New upstream release.
+  * debian/rocks:
+    - Include NEWS, README in /usr/share/doc/rhythmbox (Closes: #179430)
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Fri, 11 Apr 2003 23:43:52 -0400
+
+rhythmbox (0.4.5-6) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on the latest libvorbis-dev.
+  * debian/rocks:
+    - Disable -Werror.
+
+ -- Colin Walters <walters@debian.org>  Thu, 13 Mar 2003 18:09:53 -0500
+
+rhythmbox (0.4.5-5) unstable; urgency=low
+
+  * debian/control:
+    - Add Depends on gstreamer-core (Closes: #182114).
+
+ -- Colin Walters <walters@debian.org>  Sat, 22 Feb 2003 18:38:41 -0500
+
+rhythmbox (0.4.5-4) unstable; urgency=low
+
+  * debian/control:
+    - Add Build-Depends on gstreamer-gconf.
+
+ -- Colin Walters <walters@debian.org>  Sat, 15 Feb 2003 11:18:16 -0500
+
+rhythmbox (0.4.5-3) unstable; urgency=low
+
+  * debian/control:
+    - Add missing comma in Build-Depends.
+
+ -- Colin Walters <walters@debian.org>  Sat, 15 Feb 2003 02:10:42 -0500
+
+rhythmbox (0.4.5-2) unstable; urgency=low
+
+  * debian/control:
+    - Add Build-Depends on libflac-dev.
+
+ -- Colin Walters <walters@debian.org>  Fri, 14 Feb 2003 23:58:59 -0500
+
+rhythmbox (0.4.5-1) unstable; urgency=low
+
+  * New upstream (literally).  This package is now built from the
+  netRhythmbox branch.  This is a one-time temporary release, until
+  the next version of Rhythmbox.
+  * debian/control:
+    - Merge in dependencies from monkey-media.  Include
+    gstreamer-core-libs (Closes: #179905).
+
+ -- Colin Walters <walters@debian.org>  Thu,  6 Feb 2003 23:44:44 -0500
+
+rhythmbox (0.4.1-8) unstable; urgency=low
+
+  * NMU (with maintainer's permission)
+  * recompile against gstreamer-0.6 and monkey-media
+
+ -- David Schleef <ds@schleef.org>  Mon, 10 Feb 2003 22:11:28 -0800
+
+rhythmbox (0.4.1-7) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on the latest monkey-media (Closes: #177971).
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Wed, 22 Jan 2003 15:05:36 -0500
+
+rhythmbox (0.4.1-6) unstable; urgency=low
+
+  * debian/README.Debian:
+    - Note on how to change output sink.
+  * debian/patches/no-double-filename-escape.patch:
+    - New patch, created thanks to debugging from
+    Aleksey Kliger <aleksey+@cs.cmu.edu> (Closes: #169486).
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Fri, 10 Jan 2003 18:46:23 -0500
+
+rhythmbox (0.4.1-5) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on the latest monkey-media.
+    - Minor description tweaks again.
+
+ -- Colin Walters <walters@debian.org>  Mon, 23 Dec 2002 03:20:03 -0500
+
+rhythmbox (0.4.1-4) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on scrollkeeper.  Doh.
+
+ -- Colin Walters <walters@debian.org>  Sun, 15 Dec 2002 22:07:25 -0500
+
+rhythmbox (0.4.1-3) unstable; urgency=low
+
+  * debian/rocks:
+    - Also remove omf_timestamp file in clean rule, in an attempt to fix
+      build failures on i386.
+
+ -- Colin Walters <walters@debian.org>  Sun, 15 Dec 2002 14:02:55 -0500
+
+rhythmbox (0.4.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Make description suck less.
+    - Build-Depend on the latest monkey-media.
+
+ -- Colin Walters <walters@debian.org>  Thu, 12 Dec 2002 16:54:54 -0500
+
+rhythmbox (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Build-Depend on the latest monkey-media.
+  * debian/patches/fix-color-value-overflow-in-link.patch:
+    - Incorporated upstream; deleted.
+  * debian/patches/no-crash-on-null-LANG.patch:
+    - Incorporated upstream; deleted.
+  * debian/patches/no-crash-on-null-column-preferences.patch:
+    - Incorporated upstream; deleted.
+
+ -- Colin Walters <walters@debian.org>  Wed, 11 Dec 2002 14:10:45 -0500
+
+rhythmbox (0.4.0-4) unstable; urgency=low
+
+  * debian/rocks:
+    - Fix up XML references.
+    - Remove extra cruft in deb-extra-clean rule.
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+  * debian/postinst, debian/postrm:
+    - Old, obsolete files; deleted.
+  * debian/menu:
+    - Renamed to rhythmbox.menu, so dh_installmenu actually does something
+      with it.
+
+ -- Colin Walters <walters@debian.org>  Wed, 11 Dec 2002 01:32:40 -0500
+
+rhythmbox (0.4.0-3) unstable; urgency=low
+
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+  * debian/patches/fix-color-value-overflow-in-link.patch:
+    - Use a width of 4 instead of 2.
+  * debian/patches/no-crash-on-null-LANG.patch:
+    - New patch.
+  * debian/control:
+    - Build-Depend on the latest monkey-media.
+
+ -- Colin Walters <walters@debian.org>  Tue,  3 Dec 2002 10:49:05 -0500
+
+rhythmbox (0.4.0-2) unstable; urgency=low
+
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+  * debian/rocks:
+    - Use GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 instead of
+      GCONF_DISABLE_SCHEMA_MAKEFILE_INSTALL=1.
+  * debian/patches/fix-color-value-overflow-in-link.patch,
+    debian/patches/no-crash-on-null-column-preferences.patch:
+    - New patches from Sjoerd Simons <sjoerd@luon.net>
+      (Closes: #169199, #169204).
+
+ -- Colin Walters <walters@debian.org>  Fri, 15 Nov 2002 11:49:08 -0500
+
+rhythmbox (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Build-Depend on latest version of monkey-media.
+    - Don't Build-Depend on dbs or automake1.6.
+  * debian/rules:
+    - Use Colin's Build System.
+
+ -- Colin Walters <walters@debian.org>  Thu, 14 Nov 2002 11:42:57 -0500
+
+rhythmbox (0.3.0+release-7) unstable; urgency=low
+
+  * The "I love making the i386 users wait for the autobuilders" release.
+  * debian/control:
+    - Build-Depend on latest version of monkey-media (Closes: #168402).
+    - Bump Standards-Version to 3.5.7.
+  * debian/rules:
+    - Support DEB_BUILD_OPTIONS=noopt instead of debug.
+
+ -- Colin Walters <walters@debian.org>  Tue, 12 Nov 2002 21:22:58 -0500
+
+rhythmbox (0.3.0+release-6) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on latest version of monkey-media (Closes: #168402).
+    - Note that Internet radio isn't implemented yet.
+  * debian/patches/gconf-schema-fix.patch:
+    - New.
+  * README.Debian:
+    - Remove outdated information (Closes: #167709).
+
+ -- Colin Walters <walters@debian.org>  Sat,  9 Nov 2002 11:33:02 -0500
+
+rhythmbox (0.3.0+release-5) unstable; urgency=low
+
+  * The "Maybe this and monkey-media should be in the same tarball..." release.
+  * debian/control:
+    - Build-Depend on latest version of monkey-media.
+
+ -- Colin Walters <walters@debian.org>  Thu, 10 Oct 2002 12:36:12 -0400
+
+rhythmbox (0.3.0+release-4) unstable; urgency=low
+
+  * The "This version of rhythmbox is a bit old, but it actually works" release.
+  * First upload to sid!  (Closes: #154919)
+  * debian/control:
+    - Build-Depend on latest version of monkey-media.
+
+ -- Colin Walters <walters@debian.org>  Thu, 10 Oct 2002 12:36:12 -0400
+
+rhythmbox (0.3.0+release-3) unstable; urgency=low
+
+  * Recompile against gstreamer packages in experimental, not my own local
+    hacked-up .debs of CVS.
+
+ -- Colin Walters <walters@debian.org>  Wed,  2 Oct 2002 20:58:59 -0400
+
+rhythmbox (0.3.0+release-2) unstable; urgency=low
+
+  * debian/control:
+    - Build-Depend on the latest versions of libpanel-applet2-dev and
+      libgnomevfs2-dev.  Remove Build-Dependency on obsolete libgnutls-dev
+      package.
+    - Update description to reflect the fact that the features list is at
+      the moment a blatant set of lies.
+
+ -- Colin Walters <walters@debian.org>  Sun, 29 Sep 2002 15:23:59 -0400
+
+rhythmbox (0.3.0+release-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/control:
+    - [rhythmbox]: Depend on scrollkeeper.
+
+ -- Colin Walters <walters@debian.org>  Fri, 16 Aug 2002 22:54:00 -0400
+
+rhythmbox (0.3.0+cvs20020730-2) unstable; urgency=low
+
+  * debian/control:
+    - [src:rhythmbox] Tighten up Build-Depends.
+
+ -- Colin Walters <walters@debian.org>  Wed, 31 Jul 2002 14:13:20 -0400
+
+rhythmbox (0.3.0+cvs20020730-1) unstable; urgency=low
+
+  * Initial Release (Closes: #151346, #154919).
+
+ -- Colin Walters <walters@debian.org>  Wed, 31 Jul 2002 01:01:06 -0400
+
--- rhythmbox-0.11.5.orig/debian/rhythmbox.xpm
+++ rhythmbox-0.11.5/debian/rhythmbox.xpm
@@ -0,0 +1,307 @@
+/* XPM */
+static char * rhythmbox_xpm[] = {
+"32 32 272 2",
+"  	c None",
+". 	c #505050",
+"+ 	c #4F4F4F",
+"@ 	c #4E4E4E",
+"# 	c #444444",
+"$ 	c #171717",
+"% 	c #000000",
+"& 	c #ECECEC",
+"* 	c #E1E1E1",
+"= 	c #E0E0E0",
+"- 	c #DFDFDF",
+"; 	c #DEDEDE",
+"> 	c #DDDDDD",
+", 	c #DBDBDB",
+"' 	c #DADADA",
+") 	c #D9D9D9",
+"! 	c #D8D8D8",
+"~ 	c #D7D7D7",
+"{ 	c #D6D6D6",
+"] 	c #D5D5D5",
+"^ 	c #D4D4D4",
+"/ 	c #D3D3D3",
+"( 	c #D2D2D2",
+"_ 	c #D1D1D1",
+": 	c #D0D0D0",
+"< 	c #B4B4B4",
+"[ 	c #2C2C2C",
+"} 	c #E8E8E8",
+"| 	c #7A7A7A",
+"1 	c #867540",
+"2 	c #817240",
+"3 	c #80713F",
+"4 	c #7F713E",
+"5 	c #7E6F3D",
+"6 	c #83733C",
+"7 	c #7D6D3B",
+"8 	c #786A3B",
+"9 	c #7A6C3A",
+"0 	c #6F6339",
+"a 	c #7F6F38",
+"b 	c #898472",
+"c 	c #C6C6C6",
+"d 	c #C5C5C5",
+"e 	c #C4C4C4",
+"f 	c #C3C3C3",
+"g 	c #A7A7A7",
+"h 	c #262626",
+"i 	c #868686",
+"j 	c #B78D00",
+"k 	c #BD9500",
+"l 	c #AD8800",
+"m 	c #B58E00",
+"n 	c #D9AA00",
+"o 	c #BD9400",
+"p 	c #AE8900",
+"q 	c #BC9300",
+"r 	c #B18B00",
+"s 	c #D9AB00",
+"t 	c #DBCB92",
+"u 	c #C2C2C2",
+"v 	c #C1C1C1",
+"w 	c #A5A5A5",
+"x 	c #252525",
+"y 	c #E7E7E7",
+"z 	c #DCDCDC",
+"A 	c #DAB032",
+"B 	c #C6A432",
+"C 	c #B59732",
+"D 	c #D3AD32",
+"E 	c #C2A032",
+"F 	c #DEB732",
+"G 	c #C3A132",
+"H 	c #C5A332",
+"I 	c #B59632",
+"J 	c #C5A232",
+"K 	c #DDD0A4",
+"L 	c #C9C9C9",
+"M 	c #B7B7B7",
+"N 	c #C7C7C7",
+"O 	c #B6B6B6",
+"P 	c #A4A4A4",
+"Q 	c #E6E6E6",
+"R 	c #BABABA",
+"S 	c #878787",
+"T 	c #AAAAAA",
+"U 	c #E0D7C6",
+"V 	c #DFD6C5",
+"W 	c #EFE6D5",
+"X 	c #E3DAC9",
+"Y 	c #DDD4C3",
+"Z 	c #DCD3C2",
+"` 	c #DBD2C1",
+" .	c #DBD8D3",
+"..	c #B8B8B8",
+"+.	c #6C6C6C",
+"@.	c #6A6A6A",
+"#.	c #9C9C9C",
+"$.	c #1F1F1F",
+"%.	c #7D7D7D",
+"&.	c #979797",
+"*.	c #9B9B9B",
+"=.	c #9A9A9A",
+"-.	c #999999",
+";.	c #989898",
+">.	c #ABABAB",
+",.	c #A8A8A8",
+"'.	c #B1B1B1",
+").	c #B2B2B2",
+"!.	c #ACACAC",
+"~.	c #929292",
+"{.	c #8F8F8F",
+"].	c #8D8D8D",
+"^.	c #8C8C8C",
+"/.	c #8B8B8B",
+"(.	c #7E7E7E",
+"_.	c #484848",
+":.	c #161616",
+"<.	c #ADADAD",
+"[.	c #A9A9A9",
+"}.	c #A3A3A3",
+"|.	c #747474",
+"1.	c #0E0E0E",
+"2.	c #E4E4E4",
+"3.	c #CDCDCD",
+"4.	c #C8C8C8",
+"5.	c #CACACA",
+"6.	c #C0C0C0",
+"7.	c #CECECE",
+"8.	c #BEBEBE",
+"9.	c #B9B9B9",
+"0.	c #1D1D1D",
+"a.	c #E3E3E3",
+"b.	c #858585",
+"c.	c #BCBCBC",
+"d.	c #BFBFBF",
+"e.	c #EBEBEB",
+"f.	c #A1A1A1",
+"g.	c #232323",
+"h.	c #E2E2E2",
+"i.	c #AEAEAE",
+"j.	c #E9E9E9",
+"k.	c #898989",
+"l.	c #EDEDED",
+"m.	c #848484",
+"n.	c #EAEAEA",
+"o.	c #5C5C5C",
+"p.	c #202020",
+"q.	c #818181",
+"r.	c #CCCCCC",
+"s.	c #EEEEEE",
+"t.	c #F1F1F1",
+"u.	c #E5E5E5",
+"v.	c #595959",
+"w.	c #7C7C7C",
+"x.	c #1E1E1E",
+"y.	c #CBCBCB",
+"z.	c #8A8A8A",
+"A.	c #B3B3B3",
+"B.	c #919191",
+"C.	c #A6A6A6",
+"D.	c #4C4C4C",
+"E.	c #787878",
+"F.	c #CFCFCF",
+"G.	c #606060",
+"H.	c #555555",
+"I.	c #7F7F7F",
+"J.	c #B5B5B5",
+"K.	c #727272",
+"L.	c #BBBBBB",
+"M.	c #737373",
+"N.	c #6F6F6F",
+"O.	c #969696",
+"P.	c #838383",
+"Q.	c #949494",
+"R.	c #545454",
+"S.	c #4D4D4D",
+"T.	c #5E5E5E",
+"U.	c #939393",
+"V.	c #1C1C1C",
+"W.	c #696969",
+"X.	c #6E6E6E",
+"Y.	c #6D6D6D",
+"Z.	c #6B6B6B",
+"`.	c #686868",
+" +	c #676767",
+".+	c #666666",
+"++	c #656565",
+"@+	c #646464",
+"#+	c #585858",
+"$+	c #5B5B5B",
+"%+	c #0B0B0B",
+"&+	c #BDBDBD",
+"*+	c #B0B0B0",
+"=+	c #AFAFAF",
+"-+	c #9E9E9E",
+";+	c #A2A2A2",
+">+	c #888888",
+",+	c #979796",
+"'+	c #5E5E5C",
+")+	c #393936",
+"!+	c #262625",
+"~+	c #282827",
+"{+	c #57636E",
+"]+	c #6A7888",
+"^+	c #6A7887",
+"/+	c #56616D",
+"(+	c #1C1B1A",
+"_+	c #191916",
+":+	c #282723",
+"<+	c #95948D",
+"[+	c #8B8986",
+"}+	c #ADABA3",
+"|+	c #5F5E5A",
+"1+	c #787D80",
+"2+	c #A4B2BE",
+"3+	c #A3B1BE",
+"4+	c #777C7E",
+"5+	c #53524E",
+"6+	c #504F4B",
+"7+	c #939088",
+"8+	c #D4D0C8",
+"9+	c #BFBFBD",
+"0+	c #C3C3C0",
+"a+	c #C2C2BF",
+"b+	c #C1C1BE",
+"c+	c #C0BFBD",
+"d+	c #BFBEBC",
+"e+	c #BEBDBB",
+"f+	c #BEBDBA",
+"g+	c #BCBCB9",
+"h+	c #BBBBB8",
+"i+	c #BABAB7",
+"j+	c #BCBBB8",
+"k+	c #1B1B1B",
+"l+	c #A0A0A0",
+"m+	c #828282",
+"n+	c #1A1A1A",
+"o+	c #9F9F9F",
+"p+	c #9D9D9D",
+"q+	c #757575",
+"r+	c #191919",
+"s+	c #5F5F5F",
+"t+	c #535353",
+"u+	c #777777",
+"v+	c #7B7B7B",
+"w+	c #707070",
+"x+	c #797979",
+"y+	c #767676",
+"z+	c #717171",
+"A+	c #4B4B4B",
+"B+	c #101010",
+"C+	c #DBDBDC",
+"D+	c #636363",
+"E+	c #464646",
+"F+	c #454545",
+"G+	c #434343",
+"H+	c #424242",
+"I+	c #414141",
+"J+	c #404040",
+"K+	c #3F3F3F",
+"L+	c #3E3E3E",
+"M+	c #3D3D3D",
+"N+	c #3B3B3B",
+"O+	c #3A3A3A",
+"P+	c #393939",
+"Q+	c #373737",
+"R+	c #363636",
+"S+	c #353535",
+"T+	c #333333",
+"U+	c #323232",
+"V+	c #343434",
+"W+	c #151515",
+"                                                                ",
+"                                                                ",
+"        . . . . . . + + + + + + + + + @ @ @ @ @ @ @ # $         ",
+"      % & * = = - ; > > , , ' ) ! ! ~ { ] ^ / ( _ : < [         ",
+"      % } ! ~ { ] | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h         ",
+"      % } ~ { ] ^ i j k l k m n o p q r s t d f u v w x         ",
+"      % y ; f z v i A B C D E F G H I J F K L M N O P x         ",
+"      % Q R S M | T U U V W X Y Z Z Z Z `  ...+.< @.#.$.        ",
+"        %.&.*.*.=.-.;.;.;.>.,.'.).).!.~.{.{.].^./.(._.:.        ",
+"        S <.<.<.<.!.!.!.>.,.,.g ,.,.[.[.[.[.g g g }.|.1.        ",
+"      % 2.( ] : 3.3.3.: L 4.c 5.5.f u 6.v L / 7.8.9.;.0.        ",
+"      % a.* b./ c.c.a.2.5.,.3.Q ) 4.w d.( e.a.} M f.-.g.        ",
+"      % a.h.* : i.>.j.z (.~.7.6.^ 5.k.6.l.m.).n.4.o.k.p.        ",
+"      % h.: : N q.>.r.7.,.~.c.P L =.#.d.s.~ t.u.( v.w.x.        ",
+"      % * y.=.z.[.A.M &.B.g 9.P ^.#.C.R ~ u.* ! O D.E.0.        ",
+"      % * h.O z O ) R f _ ..F.O c.O O 9.,.).e < G.H.I.x.        ",
+"      % = J.K.L.M.9.N.u ].O.P.Q.L.9.....O /.R.S.T.U.k.V.        ",
+"        W.N.X.Y.Y.+.Z.Z.@.W.W.`. +.+.+++@+@+G.o.#+$+_.%+        ",
+"      % ; ^ ! ~ { ] ^ / / ( _ : : F.3.r.r.y.5.L L ).T $.        ",
+"      % r.e f u 6.d.8.&+L.R 9...O J.< ).*+*+=+<.!.^.-+x.        ",
+"      % y.e u 6.d.8.;+^.^.z.z.k.>+S b.m.m.,+<.>.T z.#.0.        ",
+"      % y.f 6.d.&+c.'+)+!+~+{+]+^+/+(+_+:+<+>.T [.k.*.0.        ",
+"      % 5.u 8.&+c.L.[+}+|+|+1+2+3+4+5+6+7+8+[.g C.S -.V.        ",
+"      % 5.v &+c.L.9.9+0+a+b+c+d+e+f+g+h+i+j+g C.w i &.k+        ",
+"      % c 6.9...M O J.A.'.*+=+i.!.>.T ,.C.w P ;+l+m+Q.n+        ",
+"      % 9.A.!.>.T [.g C.P P }.f.l+o+p+*.=.-.&.O.Q.q+z.r+        ",
+"      % s+t+|.u+v+| w+v+u+u+x+y+x+|.X.K.z+M.W.y+q+s+A+B+        ",
+"      % C+v 4.] h.* J.} 5.{ - < e.) 6._ { ! i.* ) P U.r+        ",
+"      % D+E+E+F+G+H+H+I+J+K+L+M+N+O+O+P+Q+R+S+T+T+U+V+W+        ",
+"          % % % % % % % % % % % % % % % % % % % % % % %         ",
+"                                                                ",
+"                                                                "};
--- rhythmbox-0.11.5.orig/debian/copyright
+++ rhythmbox-0.11.5/debian/copyright
@@ -0,0 +1,61 @@
+Initial Debianization:
+This package was debianized by Colin Walters <walters@debian.org> on
+Wed, 31 Jul 2002 01:01:06 -0400.
+
+Source:
+It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/>
+
+Upstream Authors and Copyright Holders:
+    Jorn Baayen  <jorn@nl.linux.org>
+    Paolo Borelli  <pborelli@katamail.com>
+    Kenneth Christiansen  <kenneth@gnu.org>
+    David Dollar  <david@grepninja.com>
+    Christophe Fergeau  <teuf@gnome.org>
+    Mark Finlay  <sisob@eircom.net>
+    Marco Pesenti Gritti  <marco@it.gnome.org>
+    Joshua Haberman  <joshua@haberman.com>
+    Mark Humphreys  <marquee@users.sourceforge.net>
+    James Kahn  <james@liet.net>
+    Laurens Krol <laurens.krol@planet.nl>
+    James Livingston  <doclivingston@gmail.com>
+    Xan Lopez  <xan@dimensis.com>
+    Ryan Lortie  <desrt@desrt.ca>
+    Olivier Martin  <oleevye@wanadoo.fr>
+    Jonathan Matthew  <jonathan@kaolin.wh9.net>
+    William Jon McCann  <mccann@jhu.edu>
+    Seth Nickell <snickell@stanford.edu>
+    Bastien Nocera <hadess@hadess.net>
+    Benjamin Otte  <in7y118@public.uni-hamburg.de>
+    Jan Arne Petersen  <jpetersen@gnome-de.org>
+    Kristian Rietveld  <kris@gtk.org>
+    Yann Rouillard  <y.rouillard@laposte.net>
+    Christian Schaller  <uraeus@linuxrising.org>
+    Charles Schmidt  <cschmidt2@emich.edu>
+    Dennis Smit  <synap@yourbase.nl>
+    Bob Smith  <bob@thestuff.net>
+    Michael Terry  <mterry@fastmail.fm>
+    Colin Walters  <walters@verbum.org>
+    James Willcox  <jwillcox@gnome.org>
+    Jeffrey Yasskin  <jyasskin@mail.utexas.edu>
+The complete list of upstream authors is in the file
+/usr/share/doc/rhythmbox/AUTHORS.
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- rhythmbox-0.11.5.orig/debian/TODO
+++ rhythmbox-0.11.5/debian/TODO
@@ -0,0 +1,14 @@
+$Id: TODO 11631 2007-06-19 13:24:25Z lool $
+
+This is a short compilation of nice things we could to improve rhythmbox in
+Debian.
+
+- more mailcap entries, /usr/lib/mime/packages/rhythmbox only lists some known
+  types, but the list is not exhaustive
+
+- reportbug plugin, most users can't diagnostic wether problems are coming from
+  gstreamer or from rhythmbox itself, it would be nice to extend reportbug to
+  do some basic tests or to print a message
+
+- vala support
+
--- rhythmbox-0.11.5.orig/debian/rhythmbox.links
+++ rhythmbox-0.11.5/debian/rhythmbox.links
@@ -0,0 +1,2 @@
+/usr/share/gtk-doc/html/rhythmbox /usr/share/doc/rhythmbox/development-reference
+/usr/lib/xulrunner-addons/plugins/librhythmbox-itms-detection-plugin.so /usr/lib/mozilla/plugins/librhythmbox-itms-detection-plugin.so
--- rhythmbox-0.11.5.orig/debian/control
+++ rhythmbox-0.11.5/debian/control
@@ -0,0 +1,114 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: rhythmbox
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Build-Depends: cdbs (>= 0.4.37),
+               debhelper (>= 5.0.37.2),
+               libgnome2-dev (>= 2.0.5-1),
+               libgtk2.0-dev (>= 2.8.0),
+               scrollkeeper,
+               libgnomeui-dev (>= 2.8.1-3),
+               libgnomevfs2-dev (>= 2.8.0),
+               docbook-xsl (>= 1.54.1),
+               docbook-utils (>= 0.6.11),
+               gnome-pkg-tools,
+               libxt-dev,
+               libxml-parser-perl,
+               libdbus-glib-1-dev (>= 0.60),
+               libnautilus-burn-dev (>= 2.14),
+               libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libtotem-plparser-dev (>= 2.21.4),
+               xulrunner-1.9-dev,
+               pkg-config,
+               liblircclient-dev,
+               libsoup2.4-dev (>= 2.3.2),
+               libavahi-client-dev (>= 0.6),
+               libmusicbrainz4-dev (>= 2.1.0),
+               libavahi-glib-dev (>= 0.6),
+               libtool,
+               libgpod-dev (>= 0.4),
+               libnotify-dev (>= 0.3.2),
+               libglade2-dev,
+               libgstreamer0.10-dev (>= 0.10.12),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.4),
+               zlib1g-dev,
+               libx11-dev,
+               libglib2.0-dev (>= 2.13.0),
+               gtk-doc-tools (>= 1.4),
+               libsexy-dev (>= 0.1.5),
+               python,
+               python-gst0.10,
+               python-gtk2-dev (>= 2.10),
+               python-dev,
+               gnome-doc-utils,
+               libgnome-media-dev (>= 2.8),
+               libgnome-keyring-dev,
+               python-support (>= 0.5.6),
+               libmtp-dev,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               linux-libc-dev
+Standards-Version: 3.7.2
+XS-Python-Version: >= 2.5
+
+Package: rhythmbox
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${python:Depends},
+         dbus,
+         gstreamer0.10-gnomevfs,
+         gstreamer0.10-plugins-base,
+         gstreamer0.10-plugins-good,
+         libgstreamer0.10-0,
+         gstreamer0.10-alsa | gstreamer0.10-audiosink,
+         python-gnome2 (>= 2.18),
+         python-gtk2 (>= 2.10),
+         gnome-icon-theme,
+         gstreamer0.10-x
+Conflicts: gnome-control-center (<< 2.15.90)
+Recommends: scrollkeeper,
+            yelp,
+            avahi-daemon,
+            sound-juicer,
+            gnome-volume-manager,
+            hal,
+            notification-daemon,
+            gnome-control-center (>= 2.15.90),
+            libgnomevfs2-extra,
+            gstreamer0.10-plugins-ugly,
+            python-louie,
+            python-coherence
+Suggests: gstreamer0.10-plugins-bad
+XB-Python-Version: ${python:Versions}
+Description: music player and organizer for GNOME
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+
+Package: rhythmbox-dbg
+Architecture: any
+Priority: extra
+Depends: rhythmbox (= ${binary:Version})
+Recommends: libgstreamer0.10-0-dbg,
+            gstreamer0.10-plugins-base-dbg,
+            gstreamer0.10-plugins-good-dbg,
+            gstreamer0.10-plugins-ugly-dbg
+Description:  debugging symbols for rhythmbox
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the debugging symbols for rhythmbox.
--- rhythmbox-0.11.5.orig/debian/pycompat
+++ rhythmbox-0.11.5/debian/pycompat
@@ -0,0 +1 @@
+2
--- rhythmbox-0.11.5.orig/debian/control.in
+++ rhythmbox-0.11.5/debian/control.in
@@ -0,0 +1,109 @@
+Source: rhythmbox
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs (>= 0.4.37),
+               debhelper (>= 5.0.37.2),
+               libgnome2-dev (>= 2.0.5-1),
+               libgtk2.0-dev (>= 2.8.0),
+               scrollkeeper,
+               libgnomeui-dev (>= 2.8.1-3),
+               libgnomevfs2-dev (>= 2.8.0),
+               docbook-xsl (>= 1.54.1),
+               docbook-utils (>= 0.6.11),
+               gnome-pkg-tools,
+               libxt-dev,
+               libxml-parser-perl,
+               libdbus-glib-1-dev (>= 0.60),
+               libnautilus-burn-dev (>= 2.14),
+               libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libtotem-plparser-dev (>= 2.21.4),
+               xulrunner-1.9-dev,
+               pkg-config,
+               liblircclient-dev,
+               libsoup2.4-dev (>= 2.3.2),
+               libavahi-client-dev (>= 0.6),
+               libmusicbrainz4-dev (>= 2.1.0),
+               libavahi-glib-dev (>= 0.6),
+               libtool,
+               libgpod-dev (>= 0.4),
+               libnotify-dev (>= 0.3.2),
+               libglade2-dev,
+               libgstreamer0.10-dev (>= 0.10.12),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.4),
+               zlib1g-dev,
+               libx11-dev,
+               libglib2.0-dev (>= 2.13.0),
+               gtk-doc-tools (>= 1.4),
+               libsexy-dev (>= 0.1.5),
+               python,
+               python-gst0.10,
+               python-gtk2-dev (>= 2.10),
+               python-dev,
+               gnome-doc-utils,
+               libgnome-media-dev (>= 2.8),
+               libgnome-keyring-dev,
+               python-support (>= 0.5.6),
+               libmtp-dev,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               linux-libc-dev
+Standards-Version: 3.7.2
+XS-Python-Version: >= 2.5
+
+Package: rhythmbox
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${python:Depends},
+         dbus,
+         gstreamer0.10-gnomevfs,
+         gstreamer0.10-plugins-base,
+         gstreamer0.10-plugins-good,
+         libgstreamer0.10-0,
+         gstreamer0.10-alsa | gstreamer0.10-audiosink,
+         python-gnome2 (>= 2.18),
+         python-gtk2 (>= 2.10),
+         gnome-icon-theme,
+         gstreamer0.10-x
+Conflicts: gnome-control-center (<< 2.15.90)
+Recommends: scrollkeeper,
+            yelp,
+            avahi-daemon,
+            sound-juicer,
+            gnome-volume-manager,
+            hal,
+            notification-daemon,
+            gnome-control-center (>= 2.15.90),
+            libgnomevfs2-extra,
+            gstreamer0.10-plugins-ugly,
+            python-louie,
+            python-coherence
+Suggests: gstreamer0.10-plugins-bad
+XB-Python-Version: ${python:Versions}
+Description: music player and organizer for GNOME
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+
+Package: rhythmbox-dbg
+Architecture: any
+Priority: extra
+Depends: rhythmbox (= ${binary:Version})
+Recommends: libgstreamer0.10-0-dbg,
+            gstreamer0.10-plugins-base-dbg,
+            gstreamer0.10-plugins-good-dbg,
+            gstreamer0.10-plugins-ugly-dbg
+Description:  debugging symbols for rhythmbox
+ Rhythmbox is a very easy to use music playing and management program
+ which supports a wide range of audio formats (including mp3 and ogg).
+ Originally inspired by Apple's iTunes, the current version also supports
+ Internet Radio, iPod integration and generic portable audio player
+ support, Audio CD burning, Audio CD playback, music sharing, and
+ Podcasts.
+ .
+ This package contains the debugging symbols for rhythmbox.
--- rhythmbox-0.11.5.orig/debian/rhythmbox.gconf-defaults
+++ rhythmbox-0.11.5/debian/rhythmbox.gconf-defaults
@@ -0,0 +1,2 @@
+/apps/rhythmbox/plugins/power-manager/active	false
+/apps/rhythmbox/plugins/power-manager/hidden	false
--- rhythmbox-0.11.5.orig/debian/rules
+++ rhythmbox-0.11.5/debian/rules
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+# lirc support
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc
+# disable scrollkeeper-update in make install
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+# xulrunner 1.9 is has mozilla-plugin.pc for npapi plugins
+DEB_CONFIGURE_EXTRA_FLAGS += --with-gecko=mozilla
+
+# exclude plugins from shlibs generation
+DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/rhythmbox
+
+binary-install/rhythmbox::
+	# kill *.a and *.la files of plugins and the shared lib
+	find debian/rhythmbox -name '*.a' -exec rm -f '{}' ';'
+	find debian/rhythmbox -name '*.la' -exec rm -f '{}' ';'
+	dh_pysupport /usr/lib/rhythmbox/plugins
+
--- rhythmbox-0.11.5.orig/debian/rhythmbox-client.1
+++ rhythmbox-0.11.5/debian/rhythmbox-client.1
@@ -0,0 +1,162 @@
+.\" Copyright (C) 2006 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may 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 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH rhythmbox 1 "2007\-06\-28" "GNOME"
+.SH NAME
+rhythmbox-client \- controls a running instance of rhythmbox
+.SH SYNOPSIS
+.B rhythmbox-client
+.RI [ option... ]
+.SH DESCRIPTION
+.B rhythmbox-client
+is a tool for controlling an already running instance of
+.B rhythmbox. 
+It's useful for remote control scripting or printing details of
+what's playing. 
+.SH OPTIONS
+.TP
+.B \-?,\-\-help
+Show help options
+.TP
+.B \-\-debug
+Enable debug output
+.TP
+.B \-\-no-start
+Do not start a new instance of rhythmbox
+.TP
+.B \-\-quit
+Quit rhythmbox
+.TP
+.B \-\-no-present
+Don't present an existing rhythmbox window
+.TP
+.B \-\-hide
+Hide the rhythmbox window
+.TP
+.B \-\-next
+Jump to next song
+.TP
+.B \-\-previous
+Jump to previous song
+.TP
+.B \-\-notify
+Show notification of the playing song
+.TP
+.B \-\-play
+Resume playback if currently paused
+.TP
+.B \-\-pause
+Pause playback if currently playing
+.TP
+.B \-\-play-pause
+Toggle play/pause mode
+.TP
+.BI "\-\-play-uri="URI
+Play a specified URI, importing it if necessary
+.TP
+.BI "\-\-enqueue " filename
+Add specified tracks already in the library to the play queue
+.TP
+.B \-\-clear-queue
+Empty the play queue before adding new tracks
+.TP
+.B \-\-print-playing
+Print the title and artist of the playing song
+.TP
+.B \-\-print-playing-format
+Print formatted details of the song
+.TP
+.B \-\-set-volume
+Set the playback volume
+.TP
+.B \-\-volume-up
+Increase the playback volume
+.TP
+.B \-\-volume-down
+Decrease the playback volume
+.TP
+.B \-\-print-volume
+Print the current playback volume
+.TP
+.B \-\-mute
+Mute playback
+.TP
+.B \-\-unmute
+Unmute playback
+.SH FORMAT OPTIONS
+.TP
+%at
+album title
+.TP
+%aa
+album artist
+.TP
+%aA
+album artist (lowercase)
+.TP
+%as
+album artist sortname
+.TP
+%aS
+album artist sortname (lowercase)
+.TP
+%ay
+album year
+.TP
+%ag
+album genre
+.TP
+%aG
+album genre (lowercase)
+.TP
+%an
+album disc number
+.TP
+%aN
+album disc number, zero padded
+.TP
+%tn
+track number (i.e 8)
+.TP
+%tN
+track number, zero padded (i.e 08)
+.TP
+%tt
+track title
+.TP
+%ta
+track artist
+.TP
+%tA
+track artist (lowercase)
+.TP
+%ts
+track artist sortname
+.TP
+%tS
+track artist sortname (lowercase)
+.TP
+%td
+track duration
+.TP
+%te
+track elapsed time
+.TP
+Variables can be combined using quotes. For example "%tn %aa %tt", will print the track number followed by the artist and the title of the track.
+.SH AUTHOR
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian system (but may be used by others).
+.SH SEE ALSO
+.BR "rhythmbox" (1).
--- rhythmbox-0.11.5.orig/debian/rhythmbox.manpages
+++ rhythmbox-0.11.5/debian/rhythmbox.manpages
@@ -0,0 +1,2 @@
+debian/rhythmbox.1
+debian/rhythmbox-client.1
--- rhythmbox-0.11.5.orig/debian/rhythmbox.install
+++ rhythmbox-0.11.5/debian/rhythmbox.install
@@ -0,0 +1,3 @@
+debian/rhythmbox.xpm usr/share/pixmaps
+debian/tmp/usr
+debian/tmp/etc
--- rhythmbox-0.11.5.orig/debian/README.Debian
+++ rhythmbox-0.11.5/debian/README.Debian
@@ -0,0 +1,51 @@
+---[ iPod support
+
+Make sure you install gnome-volume-manager if you want your iPod autodetected.
+
+
+---[ Configuring the output sink
+
+You can choose your preferred output sink by using gnome-sound-properties (in
+the gnome-control-center package), or by editing the GConf key:
+    /system/gstreamer/0.10/default/musicaudiosink
+
+The default is to detect your output sink automagically.
+
+
+---[ Music sharing
+
+The avahi-daemon dependency is not absolute, but is necessary for music
+sharing.  Please install avahi-daemon to share music.
+
+To be useful, avahi-daemon listens on the network by default.  This introduces
+a security risk, you might want to configure avahi-daemon or stop it to avoid
+listening in exposed areas.
+
+
+--[ mms:// web radios
+
+To read mms:// based web radios, you need gstreamer0.10-plugins-bad.
+
+
+---[ Before reporting a bug
+
+If you happen to have problems with sound output or decoding, such as a file
+that can not be played, or a crappy sound, please check whether you can
+reproduce the problem with GStreamer.  The following command reproduces the
+behavior of Rhythmbox calling GStreamer:
+    gst-launch playbin uri=file:///path/to/my/musicfile.ogg
+
+The upstream BTS is at <http://bugzilla.gnome.org/>, and there's no
+synchronization mechanism between the Debian and the GNOME BTS, so you can
+expect more information on a particular bug not related to Debian in the
+upstream BTS.  It is always ok to report a bug in the Debian BTS, this
+will help other Debian users, but the upstream BTS might give you clues
+on a particular bug you're experiencing, a quick workaround, or even tell you
+it's fixed!  ;)
+
+
+Please submit a bug report on the Debian package rhythmbox if this text is
+outdated.
+
+$Id: README.Debian 11657 2007-06-21 15:40:52Z lool $
+
--- rhythmbox-0.11.5.orig/debian/rhythmbox.menu
+++ rhythmbox-0.11.5/debian/rhythmbox.menu
@@ -0,0 +1,5 @@
+?package(rhythmbox):needs="X11" \
+ section="Apps/Sound" \
+ title="Rhythmbox" \
+ command="/usr/bin/rhythmbox" \
+ icon="/usr/share/pixmaps/rhythmbox.xpm"
--- rhythmbox-0.11.5.orig/debian/06_oggradios.patch
+++ rhythmbox-0.11.5/debian/06_oggradios.patch
@@ -0,0 +1,93 @@
+diff -Nur rhythmbox-0.9.7.90/plugins/iradio/iradio-initial.pls rhythmbox-0.9.7.90.new/plugins/iradio/iradio-initial.pls
+--- rhythmbox-0.9.7.90/plugins/iradio/iradio-initial.pls	2007-01-09 07:42:22.000000000 +0100
++++ rhythmbox-0.9.7.90.new/plugins/iradio/iradio-initial.pls	2007-02-05 14:32:46.000000000 +0100
+@@ -1,77 +1,14 @@
+ [playlist]
+-numberofentries=25
+-file1=http://www.somafm.com/groovesalad.pls
+-title1=Groove Salad
+-genre1=Ambient
+-file2=http://www.di.fm/mp3/trance128k.pls
+-title2=Digitally Imported
++numberofentries=4
++file1=http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb
++title1=Virgin Radio Classic Rock
++genre1=Rock
++file2=http://ubuntu.hbr1.com:19800/trance.ogg
++title2=HBR1.com - I.D.M. Tranceponder
+ genre2=Trance
+-file3=http://www.digitallyimported.com/mp3/trance96k.pls
+-title3=Digitally Imported - Trance
+-genre3=Trance
+-file4=http://www.digitallyimported.com/mp3/progressive96k.pls
+-title4=Digitally Imported - Progressive
+-genre4=Progressive Techno
+-file5=http://www.digitallyimported.com/mp3/deephouse96k.pls
+-title5=Digitally Imported - Deep House
+-genre5=Deep House
+-file6=http://www.somafm.com/indiepop.pls
+-title6=Indie Pop Rocks
+-genre6=Indie
+-file7=http://www.hardcoreregime.co.uk/radio.m3u
+-title7=Hardcore Regime
+-genre7=Techno
+-file8=http://streams.frequence3.net/hd-mp3.m3u
+-title8=Frequence 3
+-genre8=Pop
+-file9=http://afterhoursdjs.org/ahdjs192.m3u
+-title9=AfterHoursDJs.org - All live, all the time!
+-genre9=Electronica
+-file10=http://www.smoothbeats.com/listen.pls
+-title10=Smoothbeats.com
+-genre10=Hip Hop
+-file11=http://www.smoothbeats.com/listen2.pls
+-title11=Smoothbeats.com 2
+-genre11=Hip Hop
+-file12=http://www.bassdrive.com/BassDrive.m3u
+-title12=Bassdrive
+-genre12=Drum 'n Bass
+-file13=http://207.200.96.225:8020/listen.pls
+-title13=Bluemars
+-genre13=Ambient/Space-Music
+-file14=http://www.digitallyimported.com/mp3/classictechno96k.pls
+-title14=Digitally Imported - Classic Techno
+-genre14=Techno
+-file15=http://stream.xtcradio.com:8069/listen.pls
+-title15=X T C Radio
+-genre15=Techno/Trance
+-file16=http://www.radioparadise.com/musiclinks/rp_128.m3u
+-title16=Radio Paradise
+-genre16=Rock/Pop/Alternative
+-file17=http://somafm.com/secretagent.pls
+-title17=Secret Agent
+-genre17=Downtempo/Lounge
+-file18=http://www.puredj.com/etc/pls/128K.pls
+-title18=Pure DJ
+-genre18=House
+-file19=http://protonradio.com/proton.m3u
+-title19=Proton Radio
+-genre19=House/Dance
+-file20=http://philosomatika.com/Philosomatika.pls
+-title20=Philosomatika
+-genre20=Goa
+-file21=http://www.mostlyclassical.com/mp3/classical96k.pls
+-title21=Mostly Classical
+-genre21=Classical
+-file22=http://stream.mth-house.de:8500/listen.pls
+-title22=MTH.House
+-genre22=House
+-file23=http://la.campus.ltu.se:8000/stream.ogg.m3u
+-title23=Kohina
+-genre23=Computer-Music
+-file24=http://www.smgradio.com/core/audio/ogg/live.pls?service=vr
+-title24=Virgin Radio UK modem
+-genre24=Music
+-file25=http://www.smgradio.com/core/audio/ogg/live.pls?service=vrbb
+-title25=Virgin Radio UK broadband
+-genre25=Music
++file3=http://ubuntu.hbr1.com:19800/tronic.ogg
++title3=HBR1.com - Tronic Lounge
++genre3=House
++file4=http://ubuntu.hbr1.com:19800/ambient.ogg
++title4=HBR1.com - Dream Factory
++genre4=Ambient
--- rhythmbox-0.11.5.orig/debian/rhythmbox.1
+++ rhythmbox-0.11.5/debian/rhythmbox.1
@@ -0,0 +1,96 @@
+.\" Copyright (C) 2006 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may 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 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH rhythmbox 1 "2006\-12\-24" "GNOME"
+.SH NAME
+rhythmbox \- music player and library for tagged files using GStreamer
+.SH SYNOPSIS
+.B rhythmbox
+.RI [ option... ]
+.SH DESCRIPTION
+.B rhythmbox
+is a very easy to use music playing and management program which
+supports a wide range of audio formats (including mp3 and
+ogg). Originally inspired by Apple's iTunes, the current version also
+supports Internet Radio and Last.fm integration, iPod syncing and
+generic portable audio player support. Audio CD playback, ripping and encoding, music sharing, and Podcasts.
+.P
+For performance reasons, the remote control abilities have been moved
+from the rhythmbox binary to a separate program. See
+.BR rhythmbox-client
+and the corresponding man page for documentation.
+.SH OPTIONS
+.TP
+.B \-d, \-\-debug
+Enable debug output
+.TP
+.B \-D, \-\-debug-match
+Enable debug output matching a specified string
+.TP
+.B \-\-no-update
+Do not update the library with file changes
+.TP
+.B \-n, \-\-no-registration
+Do not register the shell
+.TP
+.B \-\-dry-run
+Don't save any data permanently (implies --no-registration)
+.TP
+.B \-\-rhythmdb-file
+Path for database file to use
+.TP
+.B \-\-playlists-file
+Path for playlists file to use
+.TP
+.B \-q, \-\-quit
+Quit rhythmbox
+.TP
+.B \-\-display=DISPLAY
+X display to use
+.TP
+.B \-?, \-\-help
+Show help options
+.TP
+.B \-\-help-all
+Show all help options
+.TP
+.B \-\-help-gst
+Show GStreamer Options
+.TP
+.B \-\-help-gtk
+Show GTK+ Options
+.TP
+.B \-\-help-bonobo-activation
+Show Bonobo Activation options
+.TP
+.B \-\-help-gnome
+Show GNOME options
+.TP
+.B \-\-help-gnome-session
+Show session management options
+.TP
+.B \-\-help-gnome-ui
+Show GNOME GUI options
+.SH AUTHOR
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian system (but may be used by others).
+.SH SEE ALSO
+.BR "rhythmbox-client" (1).
+.P
+The online documentation available through the program's
+.I Help
+menu.
+
+
--- rhythmbox-0.11.5.orig/debian/rhythmbox.mime
+++ rhythmbox-0.11.5/debian/rhythmbox.mime
@@ -0,0 +1,8 @@
+application/x-ogg; rhythmbox '%s'; description="Ogg Vorbis audio"; test=test -n "$DISPLAY"; nametemplate=%s.ogg
+application/ogg; rhythmbox '%s'; description="Ogg Media"; test=test -n "$DISPLAY"
+audio/x-mp3; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"; nametemplate=%s.mp3
+audio/x-scpls; rhythmbox '%s'; description="MP3 ShoutCast playlist"; test=test -n "$DISPLAY"; nametemplate=%s.pls
+audio/x-mpeg; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"
+audio/mpeg; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"
+audio/x-mpegurl; rhythmbox '%s'; description="Playlist"; test=test -n "$DISPLAY"; nametemplate=%s.m3u
+application/x-flac; rhythmbox '%s'; description="FLAC audio"; test=test -n "$DISPLAY"; nametemplate=%s.flac
--- rhythmbox-0.11.5.orig/debian/watch
+++ rhythmbox-0.11.5/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/([\d\.]+)[02468]/ \
+	rhythmbox-(.*).tar.gz \
+	debian uupdate
--- rhythmbox-0.11.5.orig/debian/rhythmbox.postinst
+++ rhythmbox-0.11.5/debian/rhythmbox.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# version 0.9.4.1-1 started shipping /var/lib/scrollkeeper erroneously, hence
+# the database was overwritten and needs a full rebuild
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "0.9.4.1-1" && dpkg --compare-versions "$2" lt "0.9.4.1-5" && which scrollkeeper-rebuilddb >/dev/null 2>&1; then
+    echo "Upgrade from broken Rhythmbox version detected, running scrollkeeper-rebuilddb..."
+    scrollkeeper-rebuilddb -q
+fi
+
+#DEBHELPER#
+
--- rhythmbox-0.11.5.orig/debian/patches/92_from_svn_fix_amazon_coverts_download.patch
+++ rhythmbox-0.11.5/debian/patches/92_from_svn_fix_amazon_coverts_download.patch
@@ -0,0 +1,281 @@
+--- trunk/plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py	2007/12/27 13:46:47	5508
++++ trunk/plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py	2008/04/10 22:11:54	5674
+@@ -27,6 +27,10 @@
+ DEFAULT_LOCALE = "en_US"
+ ASSOCIATE = "webservices-20"
+ 
++# We are not allowed to batch more than 2 requests at once
++# http://docs.amazonwebservices.com/AWSEcommerceService/4-0/PgCombiningOperations.html
++MAX_BATCH_JOBS = 2
++
+ 
+ class Bag: pass
+ 
+@@ -35,30 +39,31 @@
+ 		self.searching = False
+ 		self.cancel = False
+ 		self.loader = loader
+-		self._supportedLocales = {
+-			"en_US" : ("us", "xml.amazon.com", "music"),
+-			"en_GB" : ("uk", "xml-eu.amazon.com", "music"),
+-			"de" : ("de", "xml-eu.amazon.com", "music"),
+-			"ja" : ("jp", "xml.amazon.co.jp", "music-jp")
+-		}
+ 		self.db = None
+ 		self.entry = None
++		(self.tld, self.encoding) = self.__get_locale ()
+ 
+ 	def __get_locale (self):
+-		default = locale.getdefaultlocale ()
++		# "JP is the only locale that correctly takes UTF8 input. All other locales use LATIN1."
++		# http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1295&categoryID=117
++		supported_locales = {
++			"en_US" : ("com", "latin1"),
++			"en_GB" : ("co.uk", "latin1"),
++			"de" : ("de", "latin1"),
++			"ja" : ("jp", "utf8")
++		}
++
+ 		lc_id = DEFAULT_LOCALE
+-		if default[0] is not None:
+-			if self._supportedLocales.has_key (default[0]):
+-				lc_id = default[0]
++		default = locale.getdefaultlocale ()[0]
++		if default:
++			if supported_locales.has_key (default):
++				lc_id = default
+ 			else:
+-				lang = default[0].split("_")[0]
+-				if self._supportedLocales.has_key (lang):
++				lang = default.split("_")[0]
++				if supported_locales.has_key (lang):
+ 					lc_id = lang
+ 
+-		lc_host = self._supportedLocales[lc_id][1]
+-		lc_name = self._supportedLocales[lc_id][0]
+-		lc_mode = self._supportedLocales[lc_id][2]
+-		return ((lc_host, lc_name, lc_mode))
++		return supported_locales[lc_id]
+ 
+ 	def search (self, db, entry, on_search_completed_callback, *args):
+ 		self.searching = True
+@@ -72,6 +77,10 @@
+ 		st_artist = db.entry_get (entry, rhythmdb.PROP_ARTIST) or _("Unknown")
+ 		st_album = db.entry_get (entry, rhythmdb.PROP_ALBUM) or _("Unknown")
+ 
++		if st_artist == st_album == _("Unknown"):
++			self.on_search_completed (None)
++			return
++
+ 		# Tidy up
+ 
+ 		# Replace quote characters
+@@ -119,68 +128,58 @@
+ 				self.keywords.append ("%s %s" % (st_artist, st_album))
+ 				if st_album_no_vol != st_album:
+ 					self.keywords.append ("%s %s" % (st_artist, st_album_no_vol))
+-				if (st_album != _("Unknown")):
+-					self.keywords.append ("Various %s" % (st_album))
++				self.keywords.append ("Various %s" % (st_album))
+ 			self.keywords.append ("%s" % (st_artist))
+ 
+ 		# Initiate asynchronous search
+-		self.search_next ();
++		self.search_next ()
+ 
+-	def __build_url (self, keyword):
+-		(lc_host, lc_name, lc_mode) = self.__get_locale ()
++	def search_next (self):
++		if len (self.keywords) == 0:
++			# No keywords left to search -> no results
++			self.on_search_completed (None)
++			return False
+ 
+-		url = "http://" + lc_host + "/onca/xml3?f=xml"
+-		url += "&t=%s" % ASSOCIATE
+-		url += "&dev-t=%s" % LICENSE_KEY
+-		url += "&type=%s" % 'lite'
+-		url += "&locale=%s" % lc_name
+-		url += "&mode=%s" % lc_mode
+-		url += "&%s=%s" % ('KeywordSearch', urllib.quote (keyword))
++		self.searching = True
+ 
+-		return url
++		url = "http://ecs.amazonaws." + self.tld + "/onca/xml" \
++		      "?Service=AWSECommerceService"                   \
++		      "&AWSAccessKeyId=" + LICENSE_KEY +               \
++		      "&AssociateTag=" + ASSOCIATE +                   \
++		      "&ResponseGroup=Images,ItemAttributes"           \
++		      "&Operation=ItemSearch"                          \
++		      "&ItemSearch.Shared.SearchIndex=Music"
+ 
+-	def search_next (self):
+-		self.searching = True
+-		
+-		if len (self.keywords)==0:
+-			keyword = None
+-		else:
++		job = 1
++		while job <= MAX_BATCH_JOBS and len (self.keywords) > 0:
+ 			keyword = self.keywords.pop (0)
++			keyword = keyword.encode (self.encoding, "ignore")
++			keyword = keyword.strip ()
++			keyword = urllib.quote (keyword)
++			url += "&ItemSearch.%d.Keywords=%s" % (job, keyword)
++			job += 1
+ 
+-		if keyword is None:
+-			# No keywords left to search -> no results
+-			self.on_search_completed (None)
+-			ret = False
+-		else:
+-			# Retrieve search for keyword
+-			url = self.__build_url (keyword.strip ())
+-			self.loader.get_url (url, self.on_search_response)
+-			ret = True
+-
+-		return ret
++		# Retrieve search for keyword
++		self.loader.get_url (url, self.on_search_response)
++		return True
+ 
+ 	def __unmarshal (self, element):
+ 		rc = Bag ()
+-		if isinstance (element, minidom.Element) and (element.tagName == 'Details'):
+-			rc.URL = element.attributes["url"].value
+-		childElements = [e for e in element.childNodes if isinstance (e, minidom.Element)]
+-		if childElements:
+-			for child in childElements:
++		child_elements = [e for e in element.childNodes if isinstance (e, minidom.Element)]
++		if child_elements:
++			for child in child_elements:
+ 				key = child.tagName
+ 				if hasattr (rc, key):
+-					if type (getattr (rc, key)) <> type ([]):
++					if not isinstance (getattr (rc, key), list):
+ 						setattr (rc, key, [getattr (rc, key)])
+-					setattr (rc, key, getattr (rc, key) + [self.__unmarshal (child)])
+-				elif isinstance(child, minidom.Element) and (child.tagName == 'Details'):
+-					setattr (rc,key,[self.__unmarshal(child)])
++					getattr (rc, key).append (self.__unmarshal (child))
++				# get_best_match_urls() wants a list, even if there is only one item/artist
++				elif child.tagName in ("Items", "Item", "Artist"):
++					setattr (rc, key, [self.__unmarshal(child)])
+ 				else:
+ 					setattr (rc, key, self.__unmarshal(child))
+ 		else:
+ 			rc = "".join ([e.data for e in element.childNodes if isinstance (e, minidom.Text)])
+-			if element.tagName == 'SalesRank':
+-				rc = rc.replace ('.', '')
+-				rc = rc.replace (',', '')
+-				rc = int (rc)
+ 		return rc
+ 
+ 	def on_search_response (self, result_data):
+@@ -194,14 +193,14 @@
+ 			self.search_next()
+ 			return
+ 		
+-		data = self.__unmarshal (xmldoc).ProductInfo
+-
+-		if hasattr(data, 'ErrorMsg'):
+-			# Search was unsuccessful, try next keyword
++		data = self.__unmarshal (xmldoc)
++		if not hasattr (data, "ItemSearchResponse") or \
++		   not hasattr (data.ItemSearchResponse, "Items"):
++			# Something went wrong ...
+ 			self.search_next ()
+ 		else:
+ 			# We got some search results
+-			self.on_search_results (data.Details)
++			self.on_search_results (data.ItemSearchResponse.Items)
+ 
+ 	def on_search_results (self, results):
+ 		self.on_search_completed (results)
+@@ -224,25 +223,27 @@
+ 		return s
+ 
+ 	def __valid_match (self, item):
+-		if item.ImageUrlLarge == "" and item.ImageUrlMedium == "":
+-			print "%s doesn't have image URLs; ignoring" % (item.URL)
+-			return False
+-		return True
++		return (hasattr (item, "LargeImage") or hasattr (item, "MediumImage")) \
++		       and hasattr (item, "ItemAttributes")
+ 
+ 	def get_best_match_urls (self, search_results):
+ 		# Default to "no match", our results must match our criteria
+ 		best_match = None
+ 
+-		search_results = filter(self.__valid_match, search_results)
+-		try:
++		for result in search_results:
++			if not hasattr (result, "Item"):
++				# Search was unsuccessful, try next batch job
++				continue
++
++			items = filter(self.__valid_match, result.Item)
+ 			if self.search_album != _("Unknown"):
+ 				album_check = self.__tidy_up_string (self.search_album)
+-				for item in search_results:
++				for item in items:
++					if not hasattr (item.ItemAttributes, "Title"):
++						continue
+ 
+-					# Check for album name in ProductName
+-					product_name = self.__tidy_up_string (item.ProductName)
+-
+-					if product_name == album_check:
++					album = self.__tidy_up_string (item.ItemAttributes.Title)
++					if album == album_check:
+ 						# Found exact album, can not get better than that
+ 						best_match = item
+ 						break
+@@ -250,8 +251,9 @@
+ 					# Check the results for both an album name that contains the name
+ 					# we're searching for, and an album name that's a substring of the
+ 					# name we're searching for
+-					elif (best_match is None) and (product_name.find (album_check) != -1 
+-                                                                  or album_check.find (product_name) != -1):
++					elif (best_match is None) and \
++					     (album.find (album_check) != -1 or
++					      album_check.find (album) != -1):
+ 						best_match = item
+ 
+ 			# If we still have no definite hit, use first result where artist matches
+@@ -260,14 +262,11 @@
+ 				if best_match is None:
+ 					# Check if artist appears in the Artists list
+ 					hit = False
+-					for item in search_results:
+-
+-						if type (item.Artists.Artist) <> type ([]):
+-							artists = [item.Artists.Artist]
+-						else:
+-							artists = item.Artists.Artist
++					for item in items:
++						if not hasattr (item.ItemAttributes, "Artist"):
++							continue
+ 
+-						for artist in artists:
++						for artist in item.ItemAttributes.Artist:
+ 							artist = self.__tidy_up_string (artist)
+ 							if artist.find (artist_check) != -1:
+ 								best_match = item
+@@ -276,10 +275,10 @@
+ 						if hit:
+ 							break
+ 
+-			if best_match:
+-				return filter(lambda x: x != "", [item.ImageUrlLarge, item.ImageUrlMedium])
+-			else:
+-				return []
++			urls = [getattr (best_match, size).URL for size in ("LargeImage", "MediumImage")
++			        if hasattr (best_match, size)]
++			if urls:
++				return urls
+ 
+-		except TypeError:
+-			return []
++		# No search was successful
++		return []
--- rhythmbox-0.11.5.orig/debian/patches/72_from_svn_ipod_correct_set_year_tag.patch
+++ rhythmbox-0.11.5/debian/patches/72_from_svn_ipod_correct_set_year_tag.patch
@@ -0,0 +1,28 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 21:54:46	5741
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 22:01:20	5742
+@@ -465,6 +465,8 @@
+ create_ipod_song_from_entry (RhythmDBEntry *entry, const char *mimetype)
+ {
+ 	Itdb_Track *track;
++        gulong julian;
++        GDate *date;
+ 
+ 	track = itdb_track_new ();
+ 
+@@ -479,7 +481,14 @@
+ 	track->cd_nr = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
+ 	track->track_nr = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_TRACK_NUMBER);
+ 	track->bitrate = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE);
+-	track->year = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DATE);
++        julian = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DATE);
++        date = g_date_new_julian (julian);
++        if (date != NULL) {
++                track->year = g_date_get_year (date);
++                g_date_free (date);
++        } else {
++                track->year = 0;
++        }
+ 	track->time_added = itdb_time_get_mac_time ();
+ 	track->time_played = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_LAST_PLAYED);
+ 	track->time_played = itdb_time_host_to_mac (track->time_played);
+
--- rhythmbox-0.11.5.orig/debian/patches/97_from_svn_fix_ipod_crasher.patch
+++ rhythmbox-0.11.5/debian/patches/97_from_svn_fix_ipod_crasher.patch
@@ -0,0 +1,47 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/05/20 07:32:54	5704
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/05/20 21:11:16	5705
+@@ -194,8 +194,6 @@
+ static void
+ rb_ipod_source_init (RBiPodSource *source)
+ {	
+-	g_signal_connect (G_OBJECT (source), "notify::name",
+-			  (GCallback)rb_ipod_source_name_changed_cb, NULL);
+ }
+ 
+ static GObject *
+@@ -936,6 +934,9 @@
+ 				      "name", name,
+ 				      NULL);
+ 		}
++                g_signal_connect (G_OBJECT (source), "notify::name",
++		  	          (GCallback)rb_ipod_source_name_changed_cb,
++                                  NULL);
+ 		priv->load_idle_id = g_idle_add ((GSourceFunc)load_ipod_db_idle_cb, source);
+ 	}
+ 	g_object_unref (volume);
+@@ -1625,6 +1626,11 @@
+ 	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
+ 	GList *p;
+ 
++        if (priv->ipod_db == NULL) {
++            RB_SOURCE_CLASS (rb_ipod_source_parent_class)->impl_delete_thyself (source);
++            return;
++        }
++
+ 	for (p = rb_ipod_db_get_playlists (priv->ipod_db);
+ 	     p != NULL;
+ 	     p = p->next) {
+@@ -1647,10 +1653,8 @@
+ 		}
+ 	}
+ 
+-	if (priv->ipod_db != NULL) {
+-		g_object_unref (G_OBJECT (priv->ipod_db));
+-		priv->ipod_db = NULL;
+-	}
++        g_object_unref (G_OBJECT (priv->ipod_db));
++        priv->ipod_db = NULL;
+ 
+ 	RB_SOURCE_CLASS (rb_ipod_source_parent_class)->impl_delete_thyself (source);
+ }
+
--- rhythmbox-0.11.5.orig/debian/patches/81_use_uri_to_import_directory.patch
+++ rhythmbox-0.11.5/debian/patches/81_use_uri_to_import_directory.patch
@@ -0,0 +1,13 @@
+Index: sources/rb-library-source.c
+===================================================================
+--- sources/rb-library-source.c	(révision 5701)
++++ sources/rb-library-source.c	(copie de travail)
+@@ -302,7 +302,7 @@
+ 	/* Set up the default library location if there's no library location set */
+ 	list = eel_gconf_get_string_list (CONF_LIBRARY_LOCATION);
+ 	if (g_slist_length (list) == 0) {
+-		list = g_slist_prepend (list, g_strdup (rb_music_dir ()));
++		list = g_slist_prepend (list, g_filename_to_uri (rb_music_dir (), NULL, NULL));
+ 		eel_gconf_set_string_list (CONF_LIBRARY_LOCATION, list);
+ 	}
+ 	rb_slist_deep_free (list);
--- rhythmbox-0.11.5.orig/debian/patches/93_from_svn_fix_cdda_gvfs_handling.patch
+++ rhythmbox-0.11.5/debian/patches/93_from_svn_fix_cdda_gvfs_handling.patch
@@ -0,0 +1,103 @@
+--- trunk/data/rhythmbox.desktop.in.in	2008/04/10 22:11:54	5674
++++ trunk/data/rhythmbox.desktop.in.in	2008/04/11 10:48:30	5675
+@@ -2,7 +2,7 @@
+ _Name=Rhythmbox Music Player
+ _GenericName=Music Player
+ _Comment=Play and organize your music collection
+-Exec=rhythmbox
++Exec=rhythmbox %U
+ Terminal=false
+ Type=Application
+ Icon=rhythmbox
+--- trunk/plugins/audiocd/rb-audiocd-source.c	2008/04/10 22:11:54	5674
++++ trunk/plugins/audiocd/rb-audiocd-source.c	2008/04/11 10:48:30	5675
+@@ -768,6 +768,28 @@
+ 	return actions;
+ }
+ 
++static char *
++_gnome_vfs_to_gvfs_cdda_uri (const char *gnome_vfs_uri)
++{
++	GString *retval;
++	guint i;
++
++	if (strstr (gnome_vfs_uri, "/dev/") == NULL)
++		return NULL;
++
++	retval = g_string_new ("");
++	for (i = 0; gnome_vfs_uri[i] != '\0' ;) {
++		if (strncmp (gnome_vfs_uri + i, "/dev/", 5) == 0)
++			i += 5;
++		else {
++			g_string_append_c (retval, gnome_vfs_uri[i]);
++			i++;
++		}
++	}
++
++	return g_string_free (retval, FALSE);
++}
++
+ static guint
+ impl_want_uri (RBSource *source, const char *uri)
+ {
+@@ -792,6 +814,16 @@
+ 
+ 	if (strcmp (activation_uri, uri) == 0)
+ 		retval = 100;
++	else {
++		char *gvfs_uri;
++
++		/* FIXME work-around "new" gvfs style URLs:
++		 * cdda://sr0/ instead of cdda:///dev/sr0 */
++		gvfs_uri = _gnome_vfs_to_gvfs_cdda_uri (activation_uri);
++		if (strncmp (gvfs_uri, uri, strlen (gvfs_uri - 1)) == 0)
++			retval = 100;
++		g_free (gvfs_uri);
++	}
+ 
+ 	g_free (activation_uri);
+ 
+--- trunk/shell/rb-shell.c	2008/04/10 22:11:54	5674
++++ trunk/shell/rb-shell.c	2008/04/11 10:48:30	5675
+@@ -3327,13 +3327,21 @@
+ 								     uri, error))
+ 					return FALSE;
+ 			}
+-		} else if (result == TOTEM_PL_PARSER_RESULT_IGNORED && rb_uri_is_local (uri)) {
+-			/* That happens for directories */
++		} else if ((result == TOTEM_PL_PARSER_RESULT_IGNORED && rb_uri_is_local (uri))
++			   || result == TOTEM_PL_PARSER_RESULT_UNHANDLED) {
++			/* That happens for directories and unhandled schemes, such as CDDA */
+ 			playlist_source = rb_shell_guess_source_for_uri (shell, uri);
+ 			if (playlist_source == NULL || rb_source_uri_is_source (playlist_source, uri) == FALSE) {
+-				rb_debug ("%s is a directory, but doesn't have a source, adding as a dir", uri);
+-				if (!rb_shell_add_uri (shell, uri, NULL, NULL, error))
++				/* Do we have a directory? */
++				if (rb_uri_is_local (uri)) {
++					rb_debug ("%s is a directory, but doesn't have a source, adding as a dir", uri);
++					if (!rb_shell_add_uri (shell, uri, NULL, NULL, error))
++						return FALSE;
++				} else {
++					/* Or something else? */
++					rb_debug ("%s is not handled as a playlist, isn't local, and doesn't have a source, doing nothing", uri);
+ 					return FALSE;
++				}
+ 			}
+ 		} else {
+ 			rb_debug ("%s didn't parse as a playlist", uri);
+@@ -3350,7 +3358,14 @@
+ 
+ 	if (play) {
+ 		if (playlist_source != NULL) {
++			char *name;
++
+ 			rb_shell_activate_source (shell, playlist_source);
++
++			g_object_get (playlist_source, "name", &name, NULL);
++			rb_debug ("Activated source '%s' for uri %s", name, uri);
++			g_free (name);
++
+ 			return TRUE;
+ 		}
+ 
+
--- rhythmbox-0.11.5.orig/debian/patches/90_from_svn_fix_audioscrobbler_issue.patch
+++ rhythmbox-0.11.5/debian/patches/90_from_svn_fix_audioscrobbler_issue.patch
@@ -0,0 +1,48 @@
+--- trunk/plugins/audioscrobbler/rb-audioscrobbler.c	2008/03/22 10:30:55	5642
++++ trunk/plugins/audioscrobbler/rb-audioscrobbler.c	2008/03/22 11:54:45	5643
+@@ -1458,6 +1458,17 @@
+ 
+ 
+ /* Queue functions: */
++static char *rb_uri_decode (const char *uri)
++{
++#if defined(HAVE_LIBSOUP_2_4)
++    return soup_uri_decode (uri);
++#else 
++    char *decoded;
++    decoded = g_strdup (uri);
++    soup_uri_decode (decoded);
++    return decoded;
++#endif
++}
+ 
+ static AudioscrobblerEntry*
+ rb_audioscrobbler_load_entry_from_string (const char *string)
+@@ -1477,23 +1488,19 @@
+ 		if (breaks2[0] != NULL && breaks2[1] != NULL) {
+ 			if (g_str_has_prefix (breaks2[0], "a")) {
+ 				g_free (entry->artist);
+-				entry->artist = g_strdup (breaks2[1]);
+-				soup_uri_decode (entry->artist);
++				entry->artist = rb_uri_decode (breaks2[1]);
+ 			}
+ 			if (g_str_has_prefix (breaks2[0], "t")) {
+ 				g_free (entry->title);
+-				entry->title = g_strdup (breaks2[1]);
+-				soup_uri_decode (entry->title);
++				entry->title = rb_uri_decode (breaks2[1]);
+ 			}
+ 			if (g_str_has_prefix (breaks2[0], "b")) {
+ 				g_free (entry->album);
+-				entry->album = g_strdup (breaks2[1]);
+-				soup_uri_decode (entry->album);
++				entry->album = rb_uri_decode (breaks2[1]);
+ 			}
+ 			if (g_str_has_prefix (breaks2[0], "m")) {
+ 				g_free (entry->mbid);
+-				entry->mbid = g_strdup (breaks2[1]);
+-				soup_uri_decode (entry->mbid);
++				entry->mbid = rb_uri_decode (breaks2[1]);
+ 			}
+ 			if (g_str_has_prefix (breaks2[0], "l")) {
+ 				entry->length = atoi (breaks2[1]);
--- rhythmbox-0.11.5.orig/debian/patches/96_from_svn_fix_artwork_crasher.patch
+++ rhythmbox-0.11.5/debian/patches/96_from_svn_fix_artwork_crasher.patch
@@ -0,0 +1,15 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/04/30 21:17:04	5696
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/05/01 12:11:29	5697
+@@ -1257,6 +1257,10 @@
+ 		return FALSE;
+ 	}
+ 
++	if (song->album == NULL || song->artist == NULL) {
++		return FALSE;
++	}
++
+         g_object_get (G_OBJECT (isource), "entry-type", &entry_type, NULL);
+  
+ 	pixbuf = GDK_PIXBUF (g_value_get_object (metadata));
+
+
--- rhythmbox-0.11.5.orig/debian/patches/71_from_svn_fix_ipod_aac_copies.patch
+++ rhythmbox-0.11.5/debian/patches/71_from_svn_fix_ipod_aac_copies.patch
@@ -0,0 +1,24 @@
+--- trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 11:03:26	5738
++++ trunk/plugins/ipod/rb-ipod-source.c	2008/06/11 21:42:50	5739
+@@ -1669,8 +1669,8 @@
+ 	GList *ret = NULL;
+ 
+ 	/* FIXME: we should really query HAL for this */
+-	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
+ 	ret = g_list_prepend (ret, g_strdup ("audio/mpeg"));
++	ret = g_list_prepend (ret, g_strdup ("audio/aac"));
+ 
+ 	return ret;
+ }
+--- trunk/sources/rb-removable-media-source.c	2008/06/11 11:03:26	5738
++++ trunk/sources/rb-removable-media-source.c	2008/06/11 21:42:50	5739
+@@ -322,6 +322,8 @@
+ 			/* if it has a bitrate, assume it's mp3-in-wav */
+ 			if (rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_BITRATE) != 0)
+ 				entry_mime = "audio/mpeg";
++		} else if (strcmp (entry_mime, "audio/x-m4a") == 0) {
++			entry_mime = "audio/aac";
+ 		} else if (strcmp (entry_mime, "application/x-id3") == 0) {
+ 			entry_mime = "audio/mpeg";
+ 		} else if (strcmp (entry_mime, "audio/x-flac") == 0) {
+
--- rhythmbox-0.11.5.orig/debian/patches/94_from_svn_fix_podcast_parsing_issue.patch
+++ rhythmbox-0.11.5/debian/patches/94_from_svn_fix_podcast_parsing_issue.patch
@@ -0,0 +1,11 @@
+--- trunk/podcast/rb-podcast-parse.c	2008/03/30 21:37:43	5659
++++ trunk/podcast/rb-podcast-parse.c	2008/03/31 12:46:48	5660
+@@ -193,7 +193,7 @@
+ 	}
+ 
+ 	plparser = totem_pl_parser_new ();
+-	g_object_set (plparser, "recurse", FALSE, NULL);
++	g_object_set (plparser, "recurse", FALSE, "force", TRUE, NULL);
+ 	g_signal_connect (G_OBJECT (plparser), "entry-parsed", G_CALLBACK (entry_parsed), data);
+ 	g_signal_connect (G_OBJECT (plparser), "playlist-started", G_CALLBACK (playlist_started), data);
+ 	g_signal_connect (G_OBJECT (plparser), "playlist-ended", G_CALLBACK (playlist_ended), data);
--- rhythmbox-0.11.5.orig/debian/patches/91_from_svn_fix_eject_crasher.patch
+++ rhythmbox-0.11.5/debian/patches/91_from_svn_fix_eject_crasher.patch
@@ -0,0 +1,10 @@
+--- trunk/shell/rb-shell.c	2008/03/16 23:00:12	5622
++++ trunk/shell/rb-shell.c	2008/03/17 10:51:13	5623
+@@ -3351,7 +3351,6 @@
+ 	if (play) {
+ 		if (playlist_source != NULL) {
+ 			rb_shell_activate_source (shell, playlist_source);
+-			g_object_unref (playlist_source);
+ 			return TRUE;
+ 		}
+ 
--- rhythmbox-0.11.5.orig/debian/patches/02_autoconf.patch
+++ rhythmbox-0.11.5/debian/patches/02_autoconf.patch
@@ -0,0 +1,90 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.4.90/configure rhythmbox-0.11.4.90.new/configure
+--- rhythmbox-0.11.4.90/configure	2008-02-28 23:01:16.000000000 +0100
++++ rhythmbox-0.11.4.90.new/configure	2008-02-28 23:04:19.000000000 +0100
+@@ -13850,12 +13850,14 @@
+ 		  gtk+-2.0 >= \$GTK_REQS			\\
+ 		  libgnomeui-2.0			\\
+ 		  libglade-2.0				\\
++		  launchpad-integration			\\
+ 		  gnome-vfs-2.0 >= \$GNOME_VFS_REQS	\\
+ 		  gnome-vfs-module-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0") 2>&5
+   ac_status=$?
+@@ -13865,6 +13867,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0" 2>/dev/null`
+ else
+@@ -13883,12 +13886,14 @@
+ 		  gtk+-2.0 >= \$GTK_REQS			\\
+ 		  libgnomeui-2.0			\\
+ 		  libglade-2.0				\\
++		  launchpad-integration			\\
+ 		  gnome-vfs-2.0 >= \$GNOME_VFS_REQS	\\
+ 		  gnome-vfs-module-2.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0") 2>&5
+   ac_status=$?
+@@ -13898,6 +13903,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0" 2>/dev/null`
+ else
+@@ -13922,6 +13928,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0"`
+         else
+@@ -13929,6 +13936,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0"`
+         fi
+@@ -13939,6 +13947,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0) were not met:
+ 
+@@ -13955,6 +13964,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0) were not met:
+ 
+@@ -21722,7 +21732,7 @@
+ 	:
+ fi
+ fi
+-MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/mozilla/plugins"}"
++MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/xulrunner-addons/plugins"}"
+ 
+ 
+  if test x$enable_browser_plugin = xyes; then
--- rhythmbox-0.11.5.orig/debian/patches/06_oggradios.patch
+++ rhythmbox-0.11.5/debian/patches/06_oggradios.patch
@@ -0,0 +1,93 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.5/plugins/iradio/iradio-initial.pls rhythmbox-0.11.5.new/plugins/iradio/iradio-initial.pls
+--- rhythmbox-0.11.5/plugins/iradio/iradio-initial.pls	2007-11-08 22:42:58.000000000 +0100
++++ rhythmbox-0.11.5.new/plugins/iradio/iradio-initial.pls	2008-04-10 00:51:39.000000000 +0200
+@@ -1,14 +1,76 @@
+ [playlist]
+-numberofentries=4
+-file1=http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb
+-title1=Virgin Radio Classic Rock
+-genre1=Rock
+-file2=http://ubuntu.hbr1.com:19800/trance.ogg
+-title2=HBR1.com - I.D.M. Tranceponder
+-genre2=Trance
+-file3=http://ubuntu.hbr1.com:19800/tronic.ogg
+-title3=HBR1.com - Tronic Lounge
+-genre3=House
+-file4=http://ubuntu.hbr1.com:19800/ambient.ogg
+-title4=HBR1.com - Dream Factory
+-genre4=Ambient
++
++# http://www.wknc.org/listen.php
++file1=http://wknc.org:8000/wknclq.ogg.m3u
++title1=WKNC 88.1 FM (NC State) (Modem)
++genre1=Music
++
++file2=http://wknc.org:8000/wkncmq.ogg.m3u
++title2=WKNC 88.1 FM (NC State) (Broadband)
++genre2=Music
++
++# http://www.virginradio.co.uk/listen/
++file3=http://www.smgradio.com/core/audio/ogg/live.pls?service=vr
++title3=Virgin Radio UK (Modem)
++genre3=Pop
++
++file4=http://www.smgradio.com/core/audio/ogg/live.pls?service=vrbb
++title4=Virgin Radio UK (Broadband)
++genre4=Pop
++
++# http://xtreme.virginradio.co.uk/thestation/listen/index.html
++file5=http://www.smgradio.com/core/audio/ogg/live.pls?service=vx
++title5=Virgin Xtreme (Modem)
++genre5=Modern Rock
++
++file6=http://www.smgradio.com/core/audio/ogg/live.pls?service=vxbb
++title6=Virgin Xtreme (Broadband)
++genre6=Modern Rock
++
++# http://classicrock.virginradio.co.uk/thestation/listen/index.html
++file7=http://www.smgradio.com/core/audio/ogg/live.pls?service=vc
++title7=Virgin Classic Rock (Modem)
++genre7=Rock'n'Roll
++
++file8=http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb
++title8=Virgin Classic Rock (Broadband)
++genre8=Rock'n'Roll
++
++# http://www.cbc.ca/listen/ogg.html
++file9=http://www.cbc.ca/livemedia/cbcr1-toronto.m3u
++title9=CBC Radio One (Canada)
++genre9=General
++
++file10=http://www.cbc.ca/livemedia/cbcr2-toronto.m3u
++title10=CBC Radio Two (Canada)
++genre10=General
++
++# http://www.nrk.no/lyd/
++file11=http://media.hiof.no/streams/m3u/nrk-p1-172.ogg.m3u
++title11=NRK P1 (Norway)
++genre11=General
++
++file12=http://media.hiof.no/streams/m3u/nrk-p2-172.ogg.m3u
++title12=NRK P2 (Norway)
++genre12=General
++
++file13=http://media.hiof.no/streams/m3u/nrk-petre-172.ogg.m3u
++title13=NRK P3 (Norway)
++genre13=General
++
++file14=http://media.hiof.no/streams/m3u/nrk-alltid-nyheter-172.ogg.m3u
++title14=NRK Alltid Nyheter (Norway)
++genre14=
++
++file15=http://media.hiof.no/streams/m3u/nrk-mpetre-172.ogg.m3u
++title15=NRK mP3 (Norway)
++genre15=
++
++file16=http://media.hiof.no/streams/m3u/nrk-alltid-klassisk-172.ogg.m3u
++title16=NRK Alltid Klassisk (Norway)
++genre16=
++
++file17=http://media.hiof.no/streams/m3u/nrk-stortinget-172.ogg.m3u
++title17=NRK Stortinget (Norway)
++genre17=
++
--- rhythmbox-0.11.5.orig/debian/patches/98_from_svn_correctly_handle_playing_changes.patch
+++ rhythmbox-0.11.5/debian/patches/98_from_svn_correctly_handle_playing_changes.patch
@@ -0,0 +1,269 @@
+--- trunk/shell/rb-shell-player.c	2008/05/03 21:57:53	5698
++++ trunk/shell/rb-shell-player.c	2008/05/26 10:45:26	5709
+@@ -724,14 +724,14 @@
+ 		if (allow_stop) {
+ 			rb_error_dialog (NULL, _("Stream error"),
+ 					 _("Unexpected end of stream!"));
+-			rb_shell_player_set_playing_source (player, NULL);
++			rb_shell_player_stop (player);
+ 			player->priv->playing_entry_eos = TRUE;
+ 			update_stats = TRUE;
+ 		}
+ 		break;
+ 	case RB_SOURCE_EOF_STOP:
+ 		if (allow_stop) {
+-			rb_shell_player_set_playing_source (player, NULL);
++			rb_shell_player_stop (player);
+ 			player->priv->playing_entry_eos = TRUE;
+ 			update_stats = TRUE;
+ 		}
+@@ -760,7 +760,7 @@
+ 		if (allow_stop) {
+ 			if (diff < 4) {
+ 				rb_debug ("Last retry was less than 4 seconds ago...aborting retry playback");
+-				rb_shell_player_set_playing_source (player, NULL);
++				rb_shell_player_stop (player);
+ 			} else {
+ 				rb_shell_player_play_entry (player, entry, NULL);
+ 			}
+@@ -808,8 +808,16 @@
+ 			    RBShellPlayer *shell_player)
+ {
+ 	const char *location;
+-	if (entry == NULL)
+-		return;
++	if (entry == NULL) {
++		/* special case: this is called with entry == NULL to simulate an EOS
++		 * from the current playing entry.
++		 */
++		entry = shell_player->priv->playing_entry;
++		if (entry == NULL) {
++			rb_debug ("called to simulate EOS for playing entry, but nothing is playing");
++			return;
++		}
++	}
+ 
+ 	GDK_THREADS_ENTER ();
+ 
+@@ -1303,8 +1311,9 @@
+ 	RBPlayOrder *porder;
+ 	RhythmDBEntry *entry;
+ 
+-	if (player->priv->current_playing_source == NULL)
++	if (player->priv->current_playing_source == NULL) {
+ 		return NULL;
++	}
+ 
+ 	if (player->priv->current_playing_source == RB_SOURCE (player->priv->queue_source))
+ 		porder = player->priv->queue_play_order;
+@@ -1456,15 +1465,19 @@
+ {
+ 	RBEntryView *songs;
+ 
+-	if (player->priv->current_playing_source == NULL)
++	if (player->priv->current_playing_source == NULL) {
++		rb_debug ("current playing source is NULL");
+ 		return FALSE;
++	}
+ 
+ 	if (rb_player_playing (player->priv->mmplayer))
+ 		return TRUE;
+ 
+ 	/* we're obviously not playing anything, so crossfading is irrelevant */
+-	if (!rb_player_play (player->priv->mmplayer, FALSE, error))
++	if (!rb_player_play (player->priv->mmplayer, FALSE, error)) {
++		rb_debug ("player doesn't want to");
+ 		return FALSE;
++	}
+ 
+ 	songs = rb_source_get_entry_view (player->priv->current_playing_source);
+ 	if (songs)
+@@ -1870,7 +1883,7 @@
+ 			     RB_SHELL_PLAYER_ERROR,
+ 			     RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST,
+ 			     _("No previous song"));
+-		rb_shell_player_set_playing_source (player, NULL);
++		rb_shell_player_stop (player);
+ 		return FALSE;
+ 	}
+ 
+@@ -1951,9 +1964,8 @@
+ 
+ 		if (allow_stop) {
+ 			rb_debug ("No next entry, stopping playback");
+-			rb_shell_player_set_playing_source (player, NULL);
++			rb_shell_player_stop (player);
+ 			rb_play_order_set_playing_entry (player->priv->play_order, NULL);
+-			g_object_notify (G_OBJECT (player), "playing");
+ 		}
+ 	}
+ 
+@@ -1979,10 +1991,11 @@
+ 
+ 	if (!rb_shell_player_do_previous (player, &error)) {
+ 		if (error->domain != RB_SHELL_PLAYER_ERROR ||
+-		    error->code != RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST)
++		    error->code != RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST) {
+ 			g_warning ("cmd_previous: Unhandled error: %s", error->message);
+-		else if (error->code == RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST)
+-			rb_shell_player_set_playing_source (player, NULL);
++		} else if (error->code == RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST) {
++			rb_shell_player_stop (player);
++		}
+ 	}
+ }
+ 
+@@ -1994,10 +2007,11 @@
+ 
+ 	if (!rb_shell_player_do_next (player, &error)) {
+ 		if (error->domain != RB_SHELL_PLAYER_ERROR ||
+-		    error->code != RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST)
++		    error->code != RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST) {
+ 			g_warning ("cmd_next: Unhandled error: %s", error->message);
+-		else if (error->code == RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST)
+-			rb_shell_player_set_playing_source (player, NULL);
++		} else if (error->code == RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST) {
++			rb_shell_player_stop (player);
++		}
+ 	}
+ }
+ 
+@@ -2075,10 +2089,8 @@
+ 			g_object_notify (G_OBJECT (player), "playing");
+ 			/* mostly for that */
+ 		} else {
+-			rb_debug ("setting playing source to NULL");
+-			rb_shell_player_set_playing_source (player, NULL);
+-
+-			g_object_notify (G_OBJECT (player), "playing");
++			rb_debug ("stopping playback");
++			rb_shell_player_stop (player);
+ 		}
+ 	} else {
+ 		RhythmDBEntry *entry;
+@@ -2141,7 +2153,7 @@
+ 			}
+ 		} else {
+ 			if (!rb_shell_player_play (player, error)) {
+-				rb_shell_player_set_playing_source (player, NULL);
++				rb_shell_player_stop (player);
+ 				ret = FALSE;
+ 			}
+ 		}
+@@ -2803,9 +2815,6 @@
+ 		actually_set_playing_source (player, source, sync_entry_view);
+ 	}
+ 
+-	if (player->priv->current_playing_source == NULL)
+-		rb_shell_player_stop (player);
+-
+ 	rb_shell_player_sync_with_source (player);
+ 	/*g_object_notify (G_OBJECT (player), "playing");*/
+ 	if (player->priv->selected_source)
+@@ -2829,7 +2838,6 @@
+  * In general rb_shell_player_pause() should be used instead, as it stops the
+  * audio, but does not completely free resources.
+  **/
+-
+ void
+ rb_shell_player_stop (RBShellPlayer *player)
+ {
+@@ -2847,6 +2855,18 @@
+ 		g_error_free (error);
+ 	}
+ 
++	/* make sure we don't say something else is playing after this */
++	if (player->priv->emit_playing_id > 0) {
++		g_source_remove (player->priv->emit_playing_id);
++		player->priv->emit_playing_id = 0;
++	}
++
++	if (player->priv->playing_entry != NULL) {
++		rhythmdb_entry_unref (player->priv->playing_entry);
++		player->priv->playing_entry = NULL;
++	}
++
++	rb_shell_player_set_playing_source (player, NULL);
+ 	rb_shell_player_sync_with_source (player);
+ 	g_signal_emit (G_OBJECT (player),
+ 		       rb_shell_player_signals[PLAYING_SONG_CHANGED], 0,
+@@ -3014,7 +3034,7 @@
+ 
+ 	if (err->code == RB_PLAYER_ERROR_NO_AUDIO) {
+ 		/* stream has completely ended */
+-		rb_shell_player_set_playing_source (player, NULL);
++		rb_shell_player_stop (player);
+ 		do_next = FALSE;
+ 	} else if ((player->priv->current_playing_source != NULL) &&
+ 		   (rb_source_handle_eos (player->priv->current_playing_source) == RB_SOURCE_EOF_RETRY)) {
+@@ -3024,7 +3044,7 @@
+ 			rb_error_dialog (NULL,
+ 					 _("Couldn't start playback"),
+ 					 "%s", (err) ? err->message : "(null)");
+-			rb_shell_player_set_playing_source (player, NULL);
++			rb_shell_player_stop (player);
+ 			do_next = FALSE;
+ 		} else {
+ 			rb_debug ("haven't yet exhausted the URLs from the playlist");
+@@ -3057,6 +3077,12 @@
+ 
+ 	/* emit some interesting signals */
+ 	entry = rb_shell_player_get_playing_entry (player);
++	if (entry == NULL) {
++		/* this should never happen */
++		GDK_THREADS_LEAVE ();
++		g_return_val_if_fail (entry != NULL, FALSE);
++	}
++
+ 	location = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
+ 	rb_debug ("new playing stream: %s", location);
+ 	g_signal_emit (G_OBJECT (player),
+--- trunk/shell/rb-play-order.c	2008/05/20 21:11:16	5705
++++ trunk/shell/rb-play-order.c	2008/05/24 01:42:12	5706
+@@ -707,7 +707,7 @@
+ 		case RB_SOURCE_EOF_STOP:
+ 		case RB_SOURCE_EOF_RETRY:
+ 			/* stop playing */
+-			rb_shell_player_set_playing_source (player, NULL);
++			rb_shell_player_stop (player);
+ 			break;
+ 		case RB_SOURCE_EOF_NEXT:
+ 			{
+--- trunk/shell/rb-shell.c	2008/05/20 21:11:16	5705
++++ trunk/shell/rb-shell.c	2008/05/24 01:42:12	5706
+@@ -1702,8 +1702,14 @@
+ static void
+ rb_shell_activate_source (RBShell *shell, RBSource *source)
+ {
+-	/* Stop the playing source, if any */
+-	rb_shell_player_set_playing_source (shell->priv->player_shell, NULL);
++	/* FIXME
++	 *
++	 * this doesn't work correctly yet, but it's still an improvement on the
++	 * previous behaviour.
++	 *
++	 * with crossfading enabled, this fades out the current song, but
++	 * doesn't start the new one.
++	 */
+ 
+ 	/* Select the new one, and start it playing */
+ 	rb_shell_select_source (shell, source);
+@@ -1906,7 +1912,7 @@
+ 
+ 
+ 	if (source == rb_shell_player_get_playing_source (shell->priv->player_shell)) {
+-		rb_shell_player_set_playing_source (shell->priv->player_shell, NULL);
++		rb_shell_player_stop (shell->priv->player_shell);
+ 	}
+ 	if (source == shell->priv->selected_source) {
+ 		if (source != RB_SOURCE (shell->priv->library_source))
+@@ -2500,7 +2506,7 @@
+ 	rb_debug ("Quitting");
+ 
+ 	/* Stop the playing source, if any */
+-	rb_shell_player_set_playing_source (shell->priv->player_shell, NULL);
++	rb_shell_player_stop (shell->priv->player_shell);
+ 
+ 	rb_plugins_engine_shutdown ();
+ 
+
--- rhythmbox-0.11.5.orig/debian/patches/95_from_svn_extra_translatable_strings.patch
+++ rhythmbox-0.11.5/debian/patches/95_from_svn_extra_translatable_strings.patch
@@ -0,0 +1,39 @@
+--- trunk/plugins/lyrics/lyrics/__init__.py	2008/04/29 13:44:34	5692
++++ trunk/plugins/lyrics/lyrics/__init__.py	2008/04/30 10:08:47	5693
+@@ -174,12 +174,12 @@
+ 		def edit_callback(widget):
+ 			if self.edit.get_active() == 1:
+ 				self.tview.set_editable(True)
+-				self.edit.set_label("_Save")
++				self.edit.set_label(_("_Save"))
+ 			else:
+ 				if self.cache_path is not None:
+ 					save_callback()
+ 				self.tview.set_editable(False)
+-				self.edit.set_label("_Edit")
++				self.edit.set_label(_("_Edit"))
+ 
+ 		def discard_callback(widget):
+ 			if self.cache_path is not None and os.path.exists(self.cache_path):
+@@ -192,9 +192,9 @@
+ 			self.get_lyrics()
+ 	   
+ 
+-		self.edit = gtk.ToggleButton("_Edit")
++		self.edit = gtk.ToggleButton(_("_Edit"))
+ 		self.edit.connect('toggled', edit_callback)
+-		self.discard = gtk.Button("_Search again")
++		self.discard = gtk.Button(_("_Search again"))
+ 		self.discard.connect('clicked', discard_callback)
+ 		self.clear = gtk.Button(stock=gtk.STOCK_CLEAR)
+ 		self.clear.connect('clicked', clear_callback)
+@@ -278,7 +278,7 @@
+ 		self.show_all()
+ 
+ 	def s_title(self, title, artist):
+-		self.set_title(title + " - " + artist + " - Lyrics")
++		self.set_title(title + " - " + artist + " - " + _("Lyrics"))
+ 
+ class LyricsDisplayPlugin(rb.Plugin):
+ 
+
--- rhythmbox-0.11.5.orig/debian/patches/01_install_podcast_xul1.9.patch
+++ rhythmbox-0.11.5/debian/patches/01_install_podcast_xul1.9.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.4.90/configure.ac rhythmbox-0.11.4.90.new/configure.ac
+--- rhythmbox-0.11.4.90/configure.ac	2008-02-28 23:01:16.000000000 +0100
++++ rhythmbox-0.11.4.90.new/configure.ac	2008-02-28 23:03:58.000000000 +0100
+@@ -1005,7 +1005,7 @@
+ 		[glib-2.0 $gecko-plugin],
+ 		[],[enable_browser_plugins=no])
+ fi
+-MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/mozilla/plugins"}"
++MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/xulrunner-addons/plugins"}"
+ AC_ARG_VAR([MOZILLA_PLUGINDIR],[Where to install the browser plugin to])
+ 
+ AM_CONDITIONAL([ENABLE_BROWSER_PLUGIN], test x$enable_browser_plugin = xyes)
--- rhythmbox-0.11.5.orig/debian/patches/70_from_svn_fix_incorrect_ipod_shuffle_detection.patch
+++ rhythmbox-0.11.5/debian/patches/70_from_svn_fix_incorrect_ipod_shuffle_detection.patch
@@ -0,0 +1,14 @@
+--- trunk/plugins/ipod/rb-ipod-db.c	2008/06/11 21:48:41	5740
++++ trunk/plugins/ipod/rb-ipod-db.c	2008/06/11 21:54:46	5741
+@@ -682,7 +682,9 @@
+ 
+ 	info = itdb_device_get_ipod_info(priv->itdb->device);
+ 	if (info->ipod_generation == ITDB_IPOD_GENERATION_UNKNOWN ||
+-	    info->ipod_model == ITDB_IPOD_MODEL_SHUFFLE) {
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_1 ||
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_2 ||
++	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_3) {
+ 		priv->needs_shuffle_db = TRUE;
+ 	} else {
+ 		priv->needs_shuffle_db = FALSE;
+
--- rhythmbox-0.11.5.orig/debian/patches/93_from_svn_fix_xfade_locking_issue.patch
+++ rhythmbox-0.11.5/debian/patches/93_from_svn_fix_xfade_locking_issue.patch
@@ -0,0 +1,137 @@
+--- trunk/backends/gstreamer/rb-player-gst-xfade.c	2008/04/08 12:51:33	5670
++++ trunk/backends/gstreamer/rb-player-gst-xfade.c	2008/04/08 22:26:36	5671
+@@ -515,14 +515,6 @@
+ 	}
+ }
+ 
+-static void
+-dump_stream_list_lock (RBPlayerGstXFade *player)
+-{
+-	g_static_rec_mutex_lock (&player->priv->stream_list_lock);
+-	dump_stream_list (player);
+-	g_static_rec_mutex_unlock (&player->priv->stream_list_lock);
+-}
+-
+ /* caller must hold stream list lock */
+ static RBXFadeStream *
+ find_stream_by_uri (RBPlayerGstXFade *player, const char *uri)
+@@ -797,14 +789,17 @@
+ static void
+ emit_stream_error (RBXFadeStream *stream, GError *error)
+ {
++	g_static_rec_mutex_lock (&stream->player->priv->stream_list_lock);
++
+ 	if (stream->error_idle_id != 0) {
+ 		g_error_free (error);
+-		return;
++	} else {
++		stream->error = error;
++		stream->error_idle_id = g_idle_add ((GSourceFunc) emit_stream_error_cb,
++						    stream);
+ 	}
+ 
+-	stream->error = error;
+-	stream->error_idle_id = g_idle_add ((GSourceFunc) emit_stream_error_cb,
+-					    stream);
++	g_static_rec_mutex_unlock (&stream->player->priv->stream_list_lock);
+ }
+ 
+ static void
+@@ -1332,8 +1327,8 @@
+ 	GList *t;
+ 	GList *reap = NULL;
+ 
+-	player->priv->stream_reap_id = 0;
+ 	g_static_rec_mutex_lock (&player->priv->stream_list_lock);
++	player->priv->stream_reap_id = 0;
+ 	dump_stream_list (player);
+ 	for (t = player->priv->streams; t != NULL; t = t->next) {
+ 		RBXFadeStream *stream = (RBXFadeStream *)t->data;
+@@ -1358,11 +1353,14 @@
+ static void
+ schedule_stream_reap (RBPlayerGstXFade *player)
+ {
+-	if (player->priv->stream_reap_id != 0)
+-		return;
++	g_static_rec_mutex_lock (&player->priv->stream_list_lock);
+ 
+-	dump_stream_list_lock (player);
+-	player->priv->stream_reap_id = g_idle_add ((GSourceFunc) reap_streams, player);
++	if (player->priv->stream_reap_id == 0) {
++		dump_stream_list (player);
++		player->priv->stream_reap_id = g_idle_add ((GSourceFunc) reap_streams, player);
++	}
++	
++	g_static_rec_mutex_unlock (&player->priv->stream_list_lock);
+ }
+ 
+ /* emits a tag signal from the player, maybe */
+@@ -2161,6 +2159,7 @@
+ {
+ 	RBPlayerGstXFade *player = stream->player;
+ 	gboolean ret = TRUE;
++	gboolean need_reap = FALSE;
+ 
+ 	g_static_rec_mutex_lock (&player->priv->stream_list_lock);
+ 
+@@ -2198,7 +2197,8 @@
+ 			case PREROLLING:
+ 			case PREROLL_PLAY:
+ 				rb_debug ("stream %s is paused; replacing it", pstream->uri);
+-				unlink_and_dispose_stream (player, pstream);
++				pstream->state = PENDING_REMOVE;
++				need_reap = TRUE;
+ 				break;
+ 
+ 			default:
+@@ -2236,13 +2236,14 @@
+ 				break;
+ 			case PAUSED:
+ 				rb_debug ("stream %s is paused; replacing it", pstream->uri);
+-				unlink_and_dispose_stream (player, pstream);
++				pstream->state = PENDING_REMOVE;
++				need_reap = TRUE;
+ 				break;
+ 			default:
+ 				break;
+ 			}
+ 		}
+-
++	
+ 		if (playing) {
+ 			/* wait for current stream's EOS */
+ 			rb_debug ("existing playing stream found; waiting for its EOS -> WAITING_EOS");
+@@ -2252,11 +2253,7 @@
+ 			ret = link_and_unblock_stream (stream, error);
+ 		}
+ 	} else {
+-		/* replace any existing playing stream.
+-		 * might need to use schedule_stream_reap instead of
+-		 * doing it directly, since we can get in here on a streaming
+-		 * thread..  hmm.
+-		 */
++		/* replace any existing playing stream */
+ 		GList *l;
+ 		for (l = player->priv->streams; l != NULL; l = l->next) {
+ 			RBXFadeStream *pstream = (RBXFadeStream *)l->data;
+@@ -2269,7 +2266,8 @@
+ 			case FADING_IN:
+ 				/* kill this one */
+ 				rb_debug ("stopping stream %s (replaced by new stream)", pstream->uri);
+-				unlink_and_dispose_stream (player, pstream);
++				need_reap = TRUE;
++				pstream->state = PENDING_REMOVE;
+ 				break;
+ 
+ 			default:
+@@ -2281,6 +2279,10 @@
+ 		ret = link_and_unblock_stream (stream, error);
+ 	}
+ 
++	if (need_reap) {
++		schedule_stream_reap (player);
++	}
++
+ 	g_static_rec_mutex_unlock (&player->priv->stream_list_lock);
+ 
+ 	return ret;
--- rhythmbox-0.11.5.orig/debian/patches/07_fix_import_error.patch
+++ rhythmbox-0.11.5/debian/patches/07_fix_import_error.patch
@@ -0,0 +1,31 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.5/shell/rb-shell.c rhythmbox-0.11.5.new/shell/rb-shell.c
+--- rhythmbox-0.11.5/shell/rb-shell.c	2008-09-05 14:12:20.000000000 -0400
++++ rhythmbox-0.11.5.new/shell/rb-shell.c	2008-09-05 14:12:49.000000000 -0400
+@@ -2451,9 +2451,12 @@
+ 				      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ 				      FALSE);
+ 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+-	if (dir)
++	if (dir && dir[0] != 0)
+ 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
+ 							 dir);
++	else
++		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
++						     rb_music_dir ());
+ 
+ 	g_signal_connect_object (G_OBJECT (dialog),
+ 				 "response",
+@@ -2473,9 +2476,12 @@
+ 				      GTK_FILE_CHOOSER_ACTION_OPEN,
+ 				      FALSE);
+ 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+-	if (dir)
++	if (dir && dir[0] != 0)
+ 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
+ 							 dir);
++	else
++		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
++						     rb_music_dir ());
+ 
+ 	g_signal_connect_object (G_OBJECT (dialog),
+ 				 "response",
--- rhythmbox-0.11.5.orig/debian/patches/01_lpi.patch
+++ rhythmbox-0.11.5/debian/patches/01_lpi.patch
@@ -0,0 +1,44 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.5/configure.ac rhythmbox-0.11.5.new/configure.ac
+--- rhythmbox-0.11.5/configure.ac	2008-04-10 03:18:38.000000000 +0200
++++ rhythmbox-0.11.5.new/configure.ac	2008-04-10 03:18:39.000000000 +0200
+@@ -78,6 +78,7 @@
+ 		  gtk+-2.0 >= $GTK_REQS			\
+ 		  libgnomeui-2.0			\
+ 		  libglade-2.0				\
++		  launchpad-integration			\
+ 		  gnome-vfs-2.0 >= $GNOME_VFS_REQS	\
+ 		  gnome-vfs-module-2.0)
+ 
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.5/data/ui/rhythmbox-ui.xml rhythmbox-0.11.5.new/data/ui/rhythmbox-ui.xml
+--- rhythmbox-0.11.5/data/ui/rhythmbox-ui.xml	2008-01-12 22:56:46.000000000 +0100
++++ rhythmbox-0.11.5.new/data/ui/rhythmbox-ui.xml	2008-04-10 03:18:51.000000000 +0200
+@@ -90,6 +90,7 @@
+ 
+     <menu name="HelpMenu" action="Help">
+       <menuitem name="HelpContentsMenu" action="HelpContents"/>
++      <placeholder name="LaunchpadItems"/>
+       <menuitem name="HelpAboutMenu" action="HelpAbout"/>
+     </menu>
+ 
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.5/shell/rb-shell.c rhythmbox-0.11.5.new/shell/rb-shell.c
+--- rhythmbox-0.11.5/shell/rb-shell.c	2008-03-15 03:18:23.000000000 +0100
++++ rhythmbox-0.11.5.new/shell/rb-shell.c	2008-04-10 03:18:39.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
++#include <launchpad-integration.h>
+ 
+ #include <glib/gi18n.h>
+ #include <gdk/gdk.h>
+@@ -1233,6 +1234,10 @@
+ 	gtk_ui_manager_ensure_update (shell->priv->ui_manager);
+ 	gtk_window_add_accel_group (GTK_WINDOW (shell->priv->window),
+ 				    gtk_ui_manager_get_accel_group (shell->priv->ui_manager));
++
++	launchpad_integration_add_ui (shell->priv->ui_manager,
++				      "/MenuBar/HelpMenu/LaunchpadItems");
++
+ 	menubar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/MenuBar");
+ 
+ 	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), menubar, FALSE, FALSE, 0);
--- rhythmbox-0.11.5.orig/debian/patches/80_browser_by_default.patch
+++ rhythmbox-0.11.5/debian/patches/80_browser_by_default.patch
@@ -0,0 +1,158 @@
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.4.90/data/rhythmbox.schemas rhythmbox-0.11.4.90.new/data/rhythmbox.schemas
+--- rhythmbox-0.11.4.90/data/rhythmbox.schemas	2008-02-28 12:16:36.000000000 +0100
++++ rhythmbox-0.11.4.90.new/data/rhythmbox.schemas	2008-02-28 22:56:50.000000000 +0100
+@@ -12,6 +12,28 @@
+         </locale>
+       </schema>
+       <schema>
++        <key>/schemas/apps/rhythmbox/state/ipod/show_browser</key>
++        <applyto>/apps/rhythmbox/state/ipod/show_browser</applyto>
++        <owner>rhythmbox</owner>
++        <type>bool</type>
++        <default>TRUE</default>
++        <locale name="C">
++	<short>Show browser in for iPods</short>
++	<long>Show the artist and album browser for an iPod.</long>
++        </locale>
++      </schema>
++      <schema>
++        <key>/schemas/apps/rhythmbox/state/mtp/show_browser</key>
++        <applyto>/apps/rhythmbox/state/mtp/show_browser</applyto>
++        <owner>rhythmbox</owner>
++        <type>bool</type>
++        <default>TRUE</default>
++        <locale name="C">
++	<short>Show browser in for MTP-devices</short>
++	<long>Show the artist and album browser for an MTP-device.</long>
++        </locale>
++      </schema>
++      <schema>
+         <key>/schemas/apps/rhythmbox/grace_period</key>
+         <applyto>/apps/rhythmbox/grace_period</applyto>
+         <owner>rhythmbox</owner>
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.4.90/plugins/ipod/rb-ipod-source.c rhythmbox-0.11.4.90.new/plugins/ipod/rb-ipod-source.c
+--- rhythmbox-0.11.4.90/plugins/ipod/rb-ipod-source.c	2008-02-28 12:16:39.000000000 +0100
++++ rhythmbox-0.11.4.90.new/plugins/ipod/rb-ipod-source.c	2008-02-28 22:57:16.000000000 +0100
+@@ -48,11 +48,17 @@
+ #include "rhythmdb.h"
+ #include "rb-cut-and-paste-code.h"
+ 
++#define CONF_STATE_PANED_POSITION CONF_PREFIX "/state/ipod/paned_position"
++#define CONF_STATE_SHOW_BROWSER   CONF_PREFIX "/state/ipod/show_browser"
++
+ static GObject *rb_ipod_source_constructor (GType type, 
+ 					    guint n_construct_properties,
+ 					    GObjectConstructParam *construct_properties);
+ static void rb_ipod_source_dispose (GObject *object);
+ 
++static char *impl_get_browser_key (RBSource *source);
++static char *impl_get_paned_key (RBBrowserSource *source);
++
+ static gboolean impl_show_popup (RBSource *source);
+ static void impl_move_to_trash (RBSource *asource);
+ static void rb_ipod_load_songs (RBiPodSource *source);
+@@ -128,10 +134,13 @@
+ 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ 	RBSourceClass *source_class = RB_SOURCE_CLASS (klass);
+ 	RBRemovableMediaSourceClass *rms_class = RB_REMOVABLE_MEDIA_SOURCE_CLASS (klass);
++	RBBrowserSourceClass *browser_source_class = RB_BROWSER_SOURCE_CLASS (klass);
+ 
+ 	object_class->constructor = rb_ipod_source_constructor;
+ 	object_class->dispose = rb_ipod_source_dispose;
+ 
++	source_class->impl_can_browse = (RBSourceFeatureFunc) rb_true_function;
++	source_class->impl_get_browser_key  = impl_get_browser_key;
+ 	source_class->impl_show_popup = impl_show_popup;
+ 	source_class->impl_delete_thyself = impl_delete_thyself;
+ 	source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
+@@ -149,6 +158,8 @@
+ 	rms_class->impl_track_added = NULL;
+ #endif
+ 
++	browser_source_class->impl_get_paned_key = impl_get_paned_key;
++
+ 	g_type_class_add_private (klass, sizeof (RBiPodSourcePrivate));
+ }
+ 
+@@ -1070,6 +1081,18 @@
+ 	return actions;
+ }
+ 
++static char *
++impl_get_browser_key (RBSource *source)
++{
++	return g_strdup (CONF_STATE_SHOW_BROWSER);
++}
++
++static char *
++impl_get_paned_key (RBBrowserSource *source)
++{
++	return g_strdup (CONF_STATE_PANED_POSITION);
++}
++
+ static gboolean
+ impl_show_popup (RBSource *source)
+ {
+diff -Nur -x '*.orig' -x '*~' rhythmbox-0.11.4.90/plugins/mtpdevice/rb-mtp-source.c rhythmbox-0.11.4.90.new/plugins/mtpdevice/rb-mtp-source.c
+--- rhythmbox-0.11.4.90/plugins/mtpdevice/rb-mtp-source.c	2008-01-12 22:56:48.000000000 +0100
++++ rhythmbox-0.11.4.90.new/plugins/mtpdevice/rb-mtp-source.c	2008-02-28 22:56:50.000000000 +0100
+@@ -42,11 +42,16 @@
+ 
+ #include "rb-mtp-source.h"
+ 
++#define CONF_STATE_PANED_POSITION CONF_PREFIX "/state/mtp/paned_position"
++#define CONF_STATE_SHOW_BROWSER   CONF_PREFIX "/state/mtp/show_browser"
++
+ static GObject *rb_mtp_source_constructor (GType type,
+ 					   guint n_construct_properties,
+ 					   GObjectConstructParam *construct_properties);
+ static void rb_mtp_source_finalize (GObject *object);
+ 
++static char *impl_get_browser_key (RBSource *source);
++static char *impl_get_paned_key (RBBrowserSource *source);
+ 
+ static void rb_mtp_source_load_tracks (RBMtpSource*);
+ static gboolean rb_mtp_source_transfer_track_to_disk (LIBMTP_mtpdevice_t *device,
+@@ -92,10 +97,14 @@
+ 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ 	RBSourceClass *source_class = RB_SOURCE_CLASS (klass);
+ 	RBRemovableMediaSourceClass *rms_class = RB_REMOVABLE_MEDIA_SOURCE_CLASS (klass);
++	RBBrowserSourceClass *browser_source_class = RB_BROWSER_SOURCE_CLASS (klass);
+ 
+ 	object_class->constructor = rb_mtp_source_constructor;
+ 	object_class->finalize = rb_mtp_source_finalize;
+ 
++	source_class->impl_can_browse = (RBSourceFeatureFunc) rb_true_function;
++	source_class->impl_get_browser_key = impl_get_browser_key;
++
+ 	source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
+ 	source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
+ #ifdef ENABLE_TRACK_TRANSFER
+@@ -111,6 +120,8 @@
+ 	source_class->impl_delete = impl_delete;
+ 	source_class->impl_copy = impl_copy;
+ 
++	browser_source_class->impl_get_paned_key = impl_get_paned_key;
++
+ 	rms_class->impl_track_added = impl_track_added;
+ 	rms_class->impl_build_dest_uri = impl_build_dest_uri;
+ 	rms_class->impl_get_mime_types = impl_get_mime_types;
+@@ -182,6 +193,18 @@
+ 	G_OBJECT_CLASS (rb_mtp_source_parent_class)->finalize (object);
+ }
+ 
++static char *
++impl_get_browser_key (RBSource *source)
++{
++	return g_strdup (CONF_STATE_SHOW_BROWSER);
++}
++
++static char *
++impl_get_paned_key (RBBrowserSource *source)
++{
++	return g_strdup (CONF_STATE_PANED_POSITION);
++}
++
+ RBBrowserSource *
+ rb_mtp_source_new (RBShell *shell,
+ 		   LIBMTP_mtpdevice_t *device,
