r50610 - in /packages/unstable/rhythmbox/debian: rhythmbox-plugins.install rules

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

Author: jbicha-guest
Date: Wed Sep 14 20:43:51 2016
New Revision: 50610

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50610
Log:
Use env variable to set mozilla plugin dir instead of moving it in the install rule

Modified:
    packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
    packages/unstable/rhythmbox/debian/rules

Modified: packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugins.install?rev=50610&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] Wed Sep 14 20:43:51 2016
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
-usr/lib/*/mozilla/plugins/librhythmbox-itms-detection-plugin.so usr/lib/mozilla/plugins
+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

Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=50610&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules	[utf-8] Wed Sep 14 20:43:51 2016
@@ -4,6 +4,9 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
+
+# Mozilla plugins shouldn't be installed in multi-arch path
+export MOZILLA_PLUGINDIR = /usr/lib/mozilla/plugins
 
 %:
 	dh $@ --with autoreconf,gir,gnome,python3