Bug#686843: (no subject)

Artur Rona ari-tczew at tlen.pl
Wed Jul 1 21:02:49 UTC 2015


In Ubuntu, we've applied the attached patch to achieve the following:

      - debian/control, debian/rules, debian/*.install:
        + MultiArch support.

This change is strongly related to bug #783961 on BTS.

We thought you might be interested in doing the same.

-------------- next part --------------
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control gnome-keyring-3.16.0/debian/control
--- gnome-keyring-3.16.0.orig/debian/control	2015-05-04 21:00:31.000000000 +0200
+++ gnome-keyring-3.16.0/debian/control	2015-07-01 22:39:27.841583840 +0200
@@ -34,7 +34,9 @@ Homepage: https://wiki.gnome.org/GnomeKe
 
 Package: gnome-keyring
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gcr (>= 3.4),
@@ -56,6 +58,9 @@ Description: GNOME keyring services (dae
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 1.0.1-6)
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control.in gnome-keyring-3.16.0/debian/control.in
--- gnome-keyring-3.16.0.orig/debian/control.in	2015-04-17 13:46:10.000000000 +0200
+++ gnome-keyring-3.16.0/debian/control.in	2015-07-01 22:40:07.066543980 +0200
@@ -30,7 +30,9 @@ Homepage: https://wiki.gnome.org/GnomeKe
 
 Package: gnome-keyring
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gcr (>= 3.4),
@@ -52,6 +54,9 @@ Description: GNOME keyring services (dae
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 1.0.1-6)
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/libpam-gnome-keyring.install gnome-keyring-3.16.0/debian/libpam-gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/libpam-gnome-keyring.install	2015-04-14 19:35:20.000000000 +0200
+++ gnome-keyring-3.16.0/debian/libpam-gnome-keyring.install	2015-07-01 22:46:14.962792343 +0200
@@ -1,2 +1,2 @@
-lib/security/*.so
+lib/*/security/*.so
 debian/pam-configs usr/share/
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/rules gnome-keyring-3.16.0/debian/rules
--- gnome-keyring-3.16.0.orig/debian/rules	2015-04-14 19:35:20.000000000 +0200
+++ gnome-keyring-3.16.0/debian/rules	2015-07-01 22:35:07.990620882 +0200
@@ -14,7 +14,7 @@ ifeq (,$(filter $(DEB_BUILD_ARCH),kfreeb
 DEB_MAKE_CHECK_TARGET := -k check || true
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/security \
+DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
                              --enable-gtk-doc \
                              --disable-update-mime
 


More information about the pkg-gnome-maintainers mailing list