diff -u rhythmbox-0.13.1/debian/changelog rhythmbox-0.13.1/debian/changelog --- rhythmbox-0.13.1/debian/changelog +++ rhythmbox-0.13.1/debian/changelog @@ -1,8 +1,15 @@ -rhythmbox (0.13.1-0ubuntu1~webupd8~lucid1) lucid; urgency=low +rhythmbox (0.13.1-0ubuntu2~webupd8~lucid) lucid; urgency=low + + * debian/patches/91_git_fix_upnp_support.patch (LP: #350826) + - backport from trunk to fix coherence plugin exception. + + -- Alin Andrei Wed, 08 Sep 2010 12:32:30 +0200 + +rhythmbox (0.13.1-0ubuntu1) maverick; urgency=low * New upstream version, dropped backported which are int he new version - -- Alin Andrei Mon, 06 Sep 2010 18:25:58 +0200 + -- Sebastien Bacher Mon, 06 Sep 2010 18:25:58 +0200 rhythmbox (0.13.0git20100819-0ubuntu3) maverick; urgency=low diff -u rhythmbox-0.13.1/debian/patches/series rhythmbox-0.13.1/debian/patches/series --- rhythmbox-0.13.1/debian/patches/series +++ rhythmbox-0.13.1/debian/patches/series @@ -8,2 +8,3 @@ 21_update_louie_imports.patch +91_git_fix_upnp_support.patch only in patch2: unchanged: --- rhythmbox-0.13.1.orig/debian/patches/91_git_fix_upnp_support.patch +++ rhythmbox-0.13.1/debian/patches/91_git_fix_upnp_support.patch @@ -0,0 +1,20 @@ +From d7c99f82fad19078a0da1d882bde35445ca1a58f Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew +Date: Wed, 08 Sep 2010 09:37:03 +0000 +Subject: coherence: fix breakage from entry type changes (bug #629038) + +--- +diff --git a/plugins/coherence/upnp_coherence/__init__.py b/plugins/coherence/upnp_coherence/__init__.py +index 1bb0097..61e1803 100644 +--- a/plugins/coherence/upnp_coherence/__init__.py ++++ b/plugins/coherence/upnp_coherence/__init__.py +@@ -45,6 +45,7 @@ class CoherencePlugin(rb.Plugin, log.Loggable): + rb.Plugin.__init__(self) + self.coherence = None + self.config = gconf.client_get_default() ++ self.entry_type = None + + if self.config.get(gconf_keys['dmc_active']) is None: + # key not yet found represented by "None" +-- +cgit v0.8.3.1