r51570 - in /desktop/unstable/gnome-sushi/debian: changelog control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Oct 29 01:50:58 2016
New Revision: 51570

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51570
Log:
* Ensure required gir packages are added to Depends. (Closes: #842319)
* Update paths which are passed to dh_makeshlibs and dh_girepository for
  multiarch.

Modified:
    desktop/unstable/gnome-sushi/debian/changelog
    desktop/unstable/gnome-sushi/debian/control.in
    desktop/unstable/gnome-sushi/debian/rules

Modified: desktop/unstable/gnome-sushi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/changelog?rev=51570&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/changelog	[utf-8] Sat Oct 29 01:50:58 2016
@@ -1,6 +1,8 @@
 gnome-sushi (3.21.91-2) UNRELEASED; urgency=medium
 
-  * Add required gir packages to Depends. (Closes: #842319)
+  * Ensure required gir packages are added to Depends. (Closes: #842319)
+  * Update paths which are passed to dh_makeshlibs and dh_girepository for
+    multiarch.
   * Bump debhelper compat level to 10.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 29 Oct 2016 03:30:07 +0200

Modified: desktop/unstable/gnome-sushi/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/control.in?rev=51570&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/control.in	[utf-8] Sat Oct 29 01:50:58 2016
@@ -33,15 +33,10 @@
          ${misc:Depends},
          ${gir:Depends},
          nautilus (>= 3.2),
-         gir1.2-clutter-1.0,
          gir1.2-clutter-gst-3.0,
          gir1.2-gtkclutter-1.0,
-         gir1.2-evince-3.0,
-         gir1.2-gtk-3.0,
-         gir1.2-gdkpixbuf-2.0,
          gir1.2-glib-2.0,
          gir1.2-gstreamer-1.0,
-         gir1.2-gtksource-3.0,
          gir1.2-pango-1.0,
          gir1.2-webkit2-4.0,
          gstreamer1.0-plugins-good

Modified: desktop/unstable/gnome-sushi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/rules?rev=51570&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/rules	[utf-8] Sat Oct 29 01:50:58 2016
@@ -3,6 +3,7 @@
 GNOME_MODULE := sushi
 
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/dpkg/architecture.mk
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
@@ -13,11 +14,12 @@
 	dh_autoreconf --as-needed
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X/usr/lib/sushi
+	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/sushi
 
 override_dh_girepository:
 	dh_girepository -ldebian/gnome-sushi/usr/share/sushi/gir-1.0 \
-		/usr/lib/sushi/ /usr/lib/sushi/girepository-1.0/
+		/usr/lib/$(DEB_HOST_MULTIARCH)/sushi/ \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/sushi/girepository-1.0/
 
 override_dh_install:
 	find debian -name '*.la' -delete