r37493 - in /packages/experimental/rhythmbox/debian: changelog patches/00_no_webkit_no_context_pane.patch patches/rb-mb5.patch

[jeansch-guest at users.alioth.debian.org]

Author: jeansch-guest
Date: Thu Apr  4 14:30:09 2013
New Revision: 37493

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37493
Log:
* Dropped debian/patches/rb-mb5.patch (New 'audiocd' plugin code doesn't rely
  on libmusicbrainz, making this patch obsolete).
* Temporarly disable webkit support to prevent mixed gst 0.10 / 1.0 linkage.
* debian/control.in
  - Dropped 'gconf' build dependency it's not used anymore.
  - Dropped 'libmusicbrainz5' build dependency. It was introduced
    by the 'rb-mb5.patch'.
    Previous 'libmusicbrainz4' build dependency (before applying
    'rb-mb5.patch') is not needed anymore. (New 'audiocd' plugin code
    doesn't rely on libmusicbrainz).

Removed:
    packages/experimental/rhythmbox/debian/patches/rb-mb5.patch
Modified:
    packages/experimental/rhythmbox/debian/changelog
    packages/experimental/rhythmbox/debian/patches/00_no_webkit_no_context_pane.patch

Modified: packages/experimental/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/changelog?rev=37493&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/changelog [utf-8] Thu Apr  4 14:30:09 2013
@@ -2,18 +2,25 @@
 
   * New upstream version.
   * Removed debian/patches/CVE-2012-3355.patch (fixed upstream).
-  * Removed debian/patches/rb-mb5.patch (2.98 have completely new code here).
+  * Dropped debian/patches/rb-mb5.patch (New 'audiocd' plugin code doesn't rely
+    on libmusicbrainz, making this patch obsolete).
   * Updated dependencies according to configure.in:
     - libtotem-plparser-dev
     - libgrilo-0.2-dev replaces libgrilo-0.1-dev
   * Bump Standards-Version to 3.9.4.
   * Updated Vcs-Svn.
   * Added symbols file for librhythmbox-core6.
-  * Temporarly disable webkit support to prevent mixed gst 0.10 / 1.0 linkage
+  * Temporarly disable webkit support to prevent mixed gst 0.10 / 1.0 linkage.
     - debian/patches/00_no_webkit_no_context_pane.patch
     - debian/rules: --without-webkit
     - debian/rhythmbox-plugins.install: do not try to install 'context' plugin
-  * Dropped gconf and libmusicbrainz5 dependency.
+  * debian/control.in
+    - Dropped 'gconf' build dependency it's not used anymore.
+    - Dropped 'libmusicbrainz5' build dependency. It was introduced
+      by the 'rb-mb5.patch'.
+      Previous 'libmusicbrainz4' build dependency (before applying
+      'rb-mb5.patch') is not needed anymore. (New 'audiocd' plugin code
+      doesn't rely on libmusicbrainz).
 
  -- Jean Schurger <jean at schurger.org>  Mon, 18 Mar 2013 11:04:00 -0400
 

Modified: packages/experimental/rhythmbox/debian/patches/00_no_webkit_no_context_pane.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/00_no_webkit_no_context_pane.patch?rev=37493&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/00_no_webkit_no_context_pane.patch [utf-8] (original)
+++ packages/experimental/rhythmbox/debian/patches/00_no_webkit_no_context_pane.patch [utf-8] Thu Apr  4 14:30:09 2013
@@ -1,3 +1,6 @@
+From: Jean Schurger <jean at schurger.org>
+Subject: Disable webkit support to prevent mixed gst 0.10 / 1.0 linkage.
+Origin: http://lists.fedoraproject.org/pipermail/scm-commits/2012-October/882046.html
 diff -uNr rhythmbox-2.98.orig/plugins/Makefile.am rhythmbox-2.98/plugins/Makefile.am
 --- rhythmbox-2.98.orig/plugins/Makefile.am	2012-09-29 22:03:28.000000000 -0400
 +++ rhythmbox-2.98/plugins/Makefile.am	2013-03-18 13:30:28.367701044 -0400