r52187 - in /desktop/experimental/gnome-menus/debian: changelog control control.in libgnome-menu-3-0.install libgnome-menu-3-dev.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar  5 02:11:15 2017
New Revision: 52187

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52187
Log:
Convert to multiarch. (Closes: #813031)

Modified:
    desktop/experimental/gnome-menus/debian/changelog
    desktop/experimental/gnome-menus/debian/control
    desktop/experimental/gnome-menus/debian/control.in
    desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
    desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
    desktop/experimental/gnome-menus/debian/rules

Modified: desktop/experimental/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/changelog?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/changelog	[utf-8] Sun Mar  5 02:11:15 2017
@@ -1,6 +1,7 @@
 gnome-menus (3.13.3-10) UNRELEASED; urgency=medium
 
   * Drop obsolete Conflicts, Breaks and Replaces from pre-wheezy.
+  * Convert to multiarch. (Closes: #813031)
 
  -- Michael Biebl <biebl at debian.org>  Sun, 05 Mar 2017 03:06:32 +0100
 

Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control	[utf-8] Sun Mar  5 02:11:15 2017
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9.20160114~),
                dh-autoreconf,
                cdbs (>= 0.4.73),
@@ -39,6 +39,7 @@
 
 Package: libgnome-menu-3-0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: GNOME implementation of the freedesktop menu specification
@@ -54,6 +55,7 @@
 
 Package: libgnome-menu-3-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgnome-menu-3-0 (= ${binary:Version}),
@@ -73,6 +75,7 @@
 Package: gir1.2-gmenu-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control.in	[utf-8] Sun Mar  5 02:11:15 2017
@@ -35,6 +35,7 @@
 
 Package: libgnome-menu-3-0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: GNOME implementation of the freedesktop menu specification
@@ -50,6 +51,7 @@
 
 Package: libgnome-menu-3-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgnome-menu-3-0 (= ${binary:Version}),
@@ -69,6 +71,7 @@
 Package: gir1.2-gmenu-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install	[utf-8] Sun Mar  5 02:11:15 2017
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Modified: desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install	[utf-8] Sun Mar  5 02:11:15 2017
@@ -1,5 +1,5 @@
-usr/lib/*.a
-usr/lib/*.so
+usr/lib/*/*.a
+usr/lib/*/*.so
 usr/include
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
 usr/share/gir-1.0

Modified: desktop/experimental/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/rules?rev=52187&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/rules	[utf-8] Sun Mar  5 02:11:15 2017
@@ -11,6 +11,8 @@
 
 INFILES := $(wildcard debian/desktop-files/*.directory.in)
 OUTFILES := $(INFILES:.directory.in=.directory)
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_STRIP_ARGS_libgnome-menu-3-0 := --dbgsym-migration='libgnome-menu-3-0-dbg (<< 3.13.3-8~)'