r48972 - in /desktop/unstable/gnome-keyring/debian: changelog control control.in gnome-keyring.install libpam-gnome-keyring.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun  1 13:29:48 2016
New Revision: 48972

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48972
Log:
Convert to multiarch. Mark gnome-keyring as Multi-Arch: foreign and
libpam-gnome-keyring as Multi-Arch: same.

Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/control
    desktop/unstable/gnome-keyring/debian/control.in
    desktop/unstable/gnome-keyring/debian/gnome-keyring.install
    desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install
    desktop/unstable/gnome-keyring/debian/rules

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Wed Jun  1 13:29:48 2016
@@ -8,6 +8,8 @@
   * Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
   * Install gnome-keyring-3.1 man page and fix the .so link.
   * Convert from cdbs to dh.
+  * Convert to multiarch. Mark gnome-keyring as Multi-Arch: foreign and
+    libpam-gnome-keyring as Multi-Arch: same.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 01 Jun 2016 10:25:44 +0200
 

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control	[utf-8] Wed Jun  1 13:29:48 2016
@@ -34,6 +34,7 @@
 
 Package: gnome-keyring
 Architecture: any
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -56,6 +57,7 @@
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 1.0.1-6)

Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in	[utf-8] Wed Jun  1 13:29:48 2016
@@ -30,6 +30,7 @@
 
 Package: gnome-keyring
 Architecture: any
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -52,6 +53,7 @@
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 1.0.1-6)

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.install?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.install	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.install	[utf-8] Wed Jun  1 13:29:48 2016
@@ -7,6 +7,6 @@
 usr/share/man/man1/gnome-keyring-daemon.1
 usr/share/man/man1/gnome-keyring-3.1
 usr/share/p11-kit
-usr/lib/gnome-keyring/devel/*.so
+usr/lib/*/gnome-keyring/devel/*.so
 usr/lib/*/pkcs11/*.so
 etc/xdg/autostart

Modified: desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libpam-gnome-keyring.install	[utf-8] Wed Jun  1 13:29:48 2016
@@ -1,2 +1,2 @@
-lib/security/*.so
+lib/*/security/*.so
 debian/pam-configs usr/share/

Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=48972&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules	[utf-8] Wed Jun  1 13:29:48 2016
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
@@ -9,8 +10,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--with-pam-dir=/lib/security \
-		--libdir=/usr/lib \
+		--with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
 		--enable-docs
 
 override_dh_install: