r50533 - in /packages/unstable/rhythmbox/debian: ./ patches/

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Wed Sep 14 04:31:27 UTC 2016 

Author: jbicha-guest
Date: Wed Sep 14 04:31:25 2016
New Revision: 50533

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50533
Log:
Multiarchify

Added:
    packages/unstable/rhythmbox/debian/patches/
    packages/unstable/rhythmbox/debian/patches/multiarch_fallback.patch
    packages/unstable/rhythmbox/debian/patches/series
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/gir1.2-rb-3.0.install
    packages/unstable/rhythmbox/debian/librhythmbox-core10.install
    packages/unstable/rhythmbox/debian/rhythmbox-dev.install
    packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install
    packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
    packages/unstable/rhythmbox/debian/rhythmbox.install
    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=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1,3 +1,13 @@
+rhythmbox (3.4.1-2) UNRELEASED; urgency=medium
+
+  * Multiarchify
+  * Add multiarch_fallback.patch:
+    Load plugins from non-multiarch directories too
+  * Install the mozilla plugin in a non-multiarch directory since it's a
+    mozilla plugin not a totem plugin and mozilla isn't multiarch
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 14 Sep 2016 00:15:37 -0400
+
 rhythmbox (3.4.1-1) unstable; urgency=medium
 
   [ Jeremy Bicha ]

Modified: packages/unstable/rhythmbox/debian/gir1.2-rb-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/gir1.2-rb-3.0.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/gir1.2-rb-3.0.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/gir1.2-rb-3.0.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0

Modified: packages/unstable/rhythmbox/debian/librhythmbox-core10.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/librhythmbox-core10.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/librhythmbox-core10.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/librhythmbox-core10.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Added: packages/unstable/rhythmbox/debian/patches/multiarch_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/multiarch_fallback.patch?rev=50533&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/multiarch_fallback.patch	(added)
+++ packages/unstable/rhythmbox/debian/patches/multiarch_fallback.patch	[utf-8] Wed Sep 14 04:31:25 2016
@@ -0,0 +1,26 @@
+From f701bedd2aacbab2b9d0d4e0917fbfe15e42eda6 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Tue, 13 Sep 2016 23:17:34 -0400
+Subject: [PATCH] Load plugins from non-multiarch directory also
+
+---
+ shell/rb-shell.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/rb-shell.c b/shell/rb-shell.c
+index 555e0ee..970d4ca 100644
+--- a/shell/rb-shell.c
++++ b/shell/rb-shell.c
+@@ -893,6 +893,9 @@ construct_plugins (RBShell *shell)
+ 	peas_engine_add_search_path (shell->priv->plugin_engine,
+ 				     plugindir,
+ 				     plugindatadir);
++	peas_engine_add_search_path (shell->priv->plugin_engine,
++				     "/usr/lib/rhythmbox/plugins",
++				     plugindatadir);
+ 	g_free (plugindir);
+ 	g_free (plugindatadir);
+ 
+-- 
+2.9.3
+

Added: packages/unstable/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/series?rev=50533&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/series	(added)
+++ packages/unstable/rhythmbox/debian/patches/series	[utf-8] Wed Sep 14 04:31:25 2016
@@ -0,0 +1 @@
+multiarch_fallback.patch

Modified: packages/unstable/rhythmbox/debian/rhythmbox-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-dev.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-dev.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-dev.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
 usr/share/gir-1.0

Modified: packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugin-cdrecorder.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1 +1 @@
-usr/lib/rhythmbox/plugins/cd-recorder
+usr/lib/*/rhythmbox/plugins/cd-recorder

Modified: packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugins.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1,38 +1,38 @@
 #!/usr/bin/dh-exec
-usr/lib/mozilla/plugins/librhythmbox-itms-detection-plugin.so
-[linux-any] usr/lib/rhythmbox/plugins/android
-usr/lib/rhythmbox/plugins/artsearch
-usr/lib/rhythmbox/plugins/audiocd
-usr/lib/rhythmbox/plugins/audioscrobbler
+usr/lib/*/mozilla/plugins/librhythmbox-itms-detection-plugin.so usr/lib/mozilla/plugins
+[linux-any] usr/lib/*/rhythmbox/plugins/android
+usr/lib/*/rhythmbox/plugins/artsearch
+usr/lib/*/rhythmbox/plugins/audiocd
+usr/lib/*/rhythmbox/plugins/audioscrobbler
 usr/share/rhythmbox/plugins/audioscrobbler
-usr/lib/rhythmbox/plugins/context
+usr/lib/*/rhythmbox/plugins/context
 usr/share/rhythmbox/plugins/context
-usr/lib/rhythmbox/plugins/daap
-usr/lib/rhythmbox/plugins/dbus-media-server
-usr/lib/rhythmbox/plugins/fmradio
-usr/lib/rhythmbox/plugins/generic-player
-usr/lib/rhythmbox/plugins/grilo
-usr/lib/rhythmbox/plugins/im-status
-usr/lib/rhythmbox/plugins/ipod
-usr/lib/rhythmbox/plugins/iradio
-usr/lib/rhythmbox/plugins/lyrics
+usr/lib/*/rhythmbox/plugins/daap
+usr/lib/*/rhythmbox/plugins/dbus-media-server
+usr/lib/*/rhythmbox/plugins/fmradio
+usr/lib/*/rhythmbox/plugins/generic-player
+usr/lib/*/rhythmbox/plugins/grilo
+usr/lib/*/rhythmbox/plugins/im-status
+usr/lib/*/rhythmbox/plugins/ipod
+usr/lib/*/rhythmbox/plugins/iradio
+usr/lib/*/rhythmbox/plugins/lyrics
 usr/share/rhythmbox/plugins/lyrics
-usr/lib/rhythmbox/plugins/magnatune
+usr/lib/*/rhythmbox/plugins/magnatune
 usr/share/rhythmbox/plugins/magnatune
-usr/lib/rhythmbox/plugins/mmkeys
-usr/lib/rhythmbox/plugins/mpris
-[linux-any] usr/lib/rhythmbox/plugins/mtpdevice
-usr/lib/rhythmbox/plugins/notification
-usr/lib/rhythmbox/plugins/power-manager
-usr/lib/rhythmbox/plugins/python-console
-usr/lib/rhythmbox/plugins/rb
-usr/lib/rhythmbox/plugins/rblirc
+usr/lib/*/rhythmbox/plugins/mmkeys
+usr/lib/*/rhythmbox/plugins/mpris
+[linux-any] usr/lib/*/rhythmbox/plugins/mtpdevice
+usr/lib/*/rhythmbox/plugins/notification
+usr/lib/*/rhythmbox/plugins/power-manager
+usr/lib/*/rhythmbox/plugins/python-console
+usr/lib/*/rhythmbox/plugins/rb
+usr/lib/*/rhythmbox/plugins/rblirc
 usr/share/rhythmbox/plugins/rblirc
-usr/lib/rhythmbox/plugins/rbzeitgeist
-usr/lib/rhythmbox/plugins/replaygain
+usr/lib/*/rhythmbox/plugins/rbzeitgeist
+usr/lib/*/rhythmbox/plugins/replaygain
 usr/share/rhythmbox/plugins/replaygain
-usr/lib/rhythmbox/plugins/sendto
-usr/lib/rhythmbox/plugins/soundcloud
+usr/lib/*/rhythmbox/plugins/sendto
+usr/lib/*/rhythmbox/plugins/soundcloud
 usr/share/rhythmbox/plugins/soundcloud
-usr/lib/rhythmbox/plugins/webremote
+usr/lib/*/rhythmbox/plugins/webremote
 usr/share/rhythmbox/plugins/webremote

Modified: packages/unstable/rhythmbox/debian/rhythmbox.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox.install?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox.install	[utf-8] Wed Sep 14 04:31:25 2016
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/rhythmbox/rhythmbox-metadata
+usr/lib/*/rhythmbox/rhythmbox-metadata
 usr/share/applications/
 usr/share/appdata/rhythmbox.appdata.xml
 usr/share/man

Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=50533&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules	[utf-8] Wed Sep 14 04:31:25 2016
@@ -18,7 +18,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--libdir=\$${prefix}/lib \
 		--libexecdir=\$${libdir}/rhythmbox \
 		--enable-lirc \
 		--enable-gtk-doc \
@@ -32,7 +31,7 @@
 	dh_install --fail-missing -Xsample-plugins
 
 override_dh_python3:
-	dh_python3 --no-ext-rename /usr/lib/rhythmbox
+	dh_python3 --no-ext-rename /usr/lib/$(DEB_HOST_MULTIARCH)/rhythmbox
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='rhythmbox-dbg (<< 3.3.1-1~)'

More information about the pkg-gnome-commits mailing list