r50535 - in /desktop/unstable/nautilus/debian: changelog nautilus.install patches/multiarch_fallback.patch patches/series rules

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

Author: jbicha-guest
Date: Wed Sep 14 04:54:13 2016
New Revision: 50535

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

Added:
    desktop/unstable/nautilus/debian/patches/multiarch_fallback.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/nautilus.install
    desktop/unstable/nautilus/debian/patches/series
    desktop/unstable/nautilus/debian/rules

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=50535&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog	[utf-8] Wed Sep 14 04:54:13 2016
@@ -1,3 +1,11 @@
+nautilus (3.21.92-2) UNRELEASED; urgency=medium
+
+  * Multiarchify
+  * Add multiarch_fallback.patch:
+    Load extensions from non-multiarch directory too
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 13 Sep 2016 21:49:57 -0400
+
 nautilus (3.21.92-1) unstable; urgency=medium
 
   * New upstream development release.

Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=50535&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/nautilus.install	[utf-8] Wed Sep 14 04:54:13 2016
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/nautilus/extensions-3.0/*.so 
+usr/lib/*/nautilus/extensions-3.0/*.so 
 usr/share/appdata
 usr/share/applications
 usr/share/dbus-1

Added: desktop/unstable/nautilus/debian/patches/multiarch_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/multiarch_fallback.patch?rev=50535&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/multiarch_fallback.patch	(added)
+++ desktop/unstable/nautilus/debian/patches/multiarch_fallback.patch	[utf-8] Wed Sep 14 04:54:13 2016
@@ -0,0 +1,24 @@
+From 54592574c3cb951085c747680046b4787daca7f2 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Tue, 13 Sep 2016 21:33:50 -0400
+Subject: [PATCH] Load extensions from non-multiarch directory too
+
+---
+ src/nautilus-module.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nautilus-module.c b/src/nautilus-module.c
+index bf474bd..bd74cc7 100644
+--- a/src/nautilus-module.c
++++ b/src/nautilus-module.c
+@@ -260,6 +260,7 @@ nautilus_module_setup (void)
+         initialized = TRUE;
+ 
+         load_module_dir (NAUTILUS_EXTENSIONDIR);
++        load_module_dir ("/usr/lib/nautilus/extensions-3.0");
+ 
+         eel_debug_call_at_shutdown (free_module_objects);
+     }
+-- 
+2.9.3
+

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=50535&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series	[utf-8] Wed Sep 14 04:54:13 2016
@@ -0,0 +1 @@
+multiarch_fallback.patch

Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=50535&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/rules	[utf-8] Wed Sep 14 04:54:13 2016
@@ -25,7 +25,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--libdir=/usr/lib \
 		--libexecdir=/usr/lib/nautilus \
 		--disable-update-mimedb \
 		--enable-packagekit \
@@ -36,18 +35,13 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -plibnautilus-extension1a -V 'libnautilus-extension1a (>= 2.91)'
-	dh_makeshlibs -pnautilus -Xusr/lib/nautilus/extensions-3.0/
+	dh_makeshlibs -pnautilus -Xusr/lib/$(DEB_HOST_MULTIARCH)/nautilus/extensions-3.0/
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='nautilus-dbg (<< 3.20.0-1~)'
 
 override_dh_auto_test:
-# We run autopkgtest instead
+# We (will eventually) run autopkgtest instead
 
-# Multiarchify except for the nautilus extensions directory
 override_dh_install:
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
-	mv debian/tmp/usr/lib/lib*a debian/tmp/usr/lib/lib*.so* \
-		debian/tmp/usr/lib/girepository-1.0 debian/tmp/usr/lib/pkgconfig \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_install --list-missing