diff -u rhythmbox-0.11.6svn20081008/debian/control rhythmbox-0.11.6svn20081008/debian/control --- rhythmbox-0.11.6svn20081008/debian/control +++ rhythmbox-0.11.6svn20081008/debian/control @@ -6,7 +6,7 @@ Uploaders: Debian GNOME Maintainers Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5.0.37.2), - libgnome2-dev (>= 2.0.5-1), + libgnome2-dev (>= 2.0.5-1~), libgtk2.0-dev (>= 2.8.0), scrollkeeper, libgnomeui-dev (>= 2.8.1-3), @@ -48,7 +48,7 @@ libmtp-dev (>= 0.3), liblaunchpad-integration-dev (>= 0.1.17), linux-libc-dev -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 XS-Python-Version: >= 2.5 Package: rhythmbox diff -u rhythmbox-0.11.6svn20081008/debian/changelog rhythmbox-0.11.6svn20081008/debian/changelog --- rhythmbox-0.11.6svn20081008/debian/changelog +++ rhythmbox-0.11.6svn20081008/debian/changelog @@ -1,3 +1,12 @@ +rhythmbox (0.11.6svn20081008-0ubuntu4.3~ppa1+intrepid) intrepid; urgency=low + + * debian/patches/94_upstream_fix_close_and_unref_streams.patch + - Closing the streams (and unref them) before emitting the + error/complete status (LP: #276603). + * Bumped to Standards-Version 3.8.0 + + -- Patrick Kuijvenhoven Wed, 07 Jan 2009 22:52:17 +0100 + rhythmbox (0.11.6svn20081008-0ubuntu4.2) intrepid-proposed; urgency=low * debian/patches/92_upstream_change_correct_player_listing.patch: diff -u rhythmbox-0.11.6svn20081008/debian/control.in rhythmbox-0.11.6svn20081008/debian/control.in --- rhythmbox-0.11.6svn20081008/debian/control.in +++ rhythmbox-0.11.6svn20081008/debian/control.in @@ -6,7 +6,7 @@ Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5.0.37.2), - libgnome2-dev (>= 2.0.5-1), + libgnome2-dev (>= 2.0.5-1~), libgtk2.0-dev (>= 2.8.0), scrollkeeper, libgnomeui-dev (>= 2.8.1-3), @@ -48,7 +48,7 @@ libmtp-dev (>= 0.3), liblaunchpad-integration-dev (>= 0.1.17), linux-libc-dev -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 XS-Python-Version: >= 2.5 Package: rhythmbox only in patch2: unchanged: --- rhythmbox-0.11.6svn20081008.orig/debian/patches/94_upstream_fix_close_and_unref_streams.patch +++ rhythmbox-0.11.6svn20081008/debian/patches/94_upstream_fix_close_and_unref_streams.patch @@ -0,0 +1,29 @@ +# Description: Close and unref streams before emitting the error/complete status. +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=554556 +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/rhythmbox/+bug/276603 +--- podcast/rb-podcast-manager.c 2008-10-07 18:06:08.000000000 +0200 ++++ podcast/rb-podcast-manager.c 2008-11-17 20:15:06.000000000 +0100 +@@ -1518,17 +1518,19 @@ + download_progress (data, downloaded, data->download_size, FALSE); + } + ++ /* close everything */ ++ g_input_stream_close (G_INPUT_STREAM (data->in_stream), data->cancel, NULL); ++ g_object_unref (data->in_stream); ++ ++ g_output_stream_close (G_OUTPUT_STREAM (data->out_stream), data->cancel, &error); ++ g_object_unref (data->out_stream); ++ + if (error != NULL) { + download_error (data, error); + } else { + download_progress (data, downloaded, data->download_size, TRUE); + } + +- /* close everything */ +- g_input_stream_close (G_INPUT_STREAM (data->in_stream), data->cancel, NULL); +- /* probably should actually care about this.. */ +- g_output_stream_close (G_OUTPUT_STREAM (data->out_stream), data->cancel, NULL); +- + return NULL; + }