r22473 - in /packages/unstable/rhythmbox/debian: changelog control control.in patches/ patches/01_dlna_vorbis.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 30 13:17:29 2009
New Revision: 22473

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22473
Log:
* Switch to quilt for patch management.
* 01_dlna_vorbis.patch: patch from Brent Hendricks to enable Ogg 
  Vorbis playback on UPnP/DLNA shares. Closes: #558694.

Added:
    packages/unstable/rhythmbox/debian/patches/
    packages/unstable/rhythmbox/debian/patches/01_dlna_vorbis.patch
    packages/unstable/rhythmbox/debian/patches/series
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/control.in
    packages/unstable/rhythmbox/debian/rules

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=22473&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Mon Nov 30 13:17:29 2009
@@ -1,3 +1,11 @@
+rhythmbox (0.12.6-2) UNRELEASED; urgency=low
+
+  * Switch to quilt for patch management.
+  * 01_dlna_vorbis.patch: patch from Brent Hendricks to enable Ogg 
+    Vorbis playback on UPnP/DLNA shares. Closes: #558694.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 30 Nov 2009 14:11:23 +0100
+
 rhythmbox (0.12.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=22473&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Mon Nov 30 13:17:29 2009
@@ -1,3 +1,8 @@
+# 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
@@ -6,6 +11,7 @@
 Build-Depends: cdbs (>= 0.4.37),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
+               quilt,
                intltool (>= 0.35.0),
                libdbus-glib-1-dev (>= 0.35),
                libgstreamer0.10-dev (>= 0.10.20),

Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=22473&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Mon Nov 30 13:17:29 2009
@@ -6,6 +6,7 @@
 Build-Depends: cdbs (>= 0.4.37),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
+               quilt,
                intltool (>= 0.35.0),
                libdbus-glib-1-dev (>= 0.35),
                libgstreamer0.10-dev (>= 0.10.20),

Added: packages/unstable/rhythmbox/debian/patches/01_dlna_vorbis.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/01_dlna_vorbis.patch?rev=22473&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/01_dlna_vorbis.patch (added)
+++ packages/unstable/rhythmbox/debian/patches/01_dlna_vorbis.patch [utf-8] Mon Nov 30 13:17:29 2009
@@ -1,0 +1,15 @@
+Index: rhythmbox-0.12.6/plugins/coherence/upnp_coherence/MediaPlayer.py
+===================================================================
+--- rhythmbox-0.12.6.orig/plugins/coherence/upnp_coherence/MediaPlayer.py	2009-11-30 14:16:02.278603086 +0100
++++ rhythmbox-0.12.6/plugins/coherence/upnp_coherence/MediaPlayer.py	2009-11-30 14:16:05.994603980 +0100
+@@ -421,7 +421,9 @@ class RhythmboxPlayer(log.Loggable):
+         self.current_connection_id = None
+         self.server.connection_manager_server.set_variable(0, 'SinkProtocolInfo',
+                             ['rhythmbox:%s:audio/mpeg:*' % self.server.coherence.hostname,
+-                             'http-get:*:audio/mpeg:*'],
++                             'rhythmbox:%s:application/ogg:*' % self.server.coherence.hostname,
++                             'http-get:*:audio/mpeg:*',
++                             'http-get:*:application/ogg:*'],
+                             default=True)
+         self.server.av_transport_server.set_variable(0, 'TransportState', 'NO_MEDIA_PRESENT', default=True)
+         self.server.av_transport_server.set_variable(0, 'TransportStatus', 'OK', default=True)

Added: packages/unstable/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/series?rev=22473&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/series (added)
+++ packages/unstable/rhythmbox/debian/patches/series [utf-8] Mon Nov 30 13:17:29 2009
@@ -1,0 +1,1 @@
+01_dlna_vorbis.patch

Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=22473&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules [utf-8] Mon Nov 30 13:17:29 2009
@@ -1,7 +1,7 @@
 #!/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/patchsys-quilt.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/uploaders.mk