diff -Nru gnome-keyring-3.2.2/debian/changelog gnome-keyring-3.2.2/debian/changelog --- gnome-keyring-3.2.2/debian/changelog 2013-03-08 18:06:19.000000000 +0200 +++ gnome-keyring-3.2.2/debian/changelog 2013-07-06 11:26:59.000000000 +0200 @@ -1,3 +1,13 @@ +gnome-keyring (3.2.2-2ubuntu4.3) precise-proposed; urgency=low + + * Backport the following changes from gnome-keyring in Raring: + - Move the PKCS#11 module into a separate package. (LP: #1094319) + - Convert gnome-keyring to multi-arch. (LP: #859600) + * Backport the following change from gcr in Saucy: + - Convert gcr to multi-arch (LP: #998715) + + -- Graham Inggs Sat, 06 Jul 2013 10:30:30 +0200 + gnome-keyring (3.2.2-2ubuntu4.1) precise; urgency=low * debian/patches/git_leak_fix.patch: "rpc-layer: Fix memory leak in call diff -Nru gnome-keyring-3.2.2/debian/control.in gnome-keyring-3.2.2/debian/control.in --- gnome-keyring-3.2.2/debian/control.in 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/control.in 2013-07-06 10:59:16.000000000 +0200 @@ -4,9 +4,9 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 8.1.3), dh-autoreconf, - cdbs, + cdbs (>= 0.4.93~), gnome-pkg-tools (>= 0.10), intltool (>= 0.35.0), libgtk-3-dev (>= 3.0.0), @@ -28,10 +28,14 @@ Package: gnome-keyring Architecture: any +Multi-Arch: foreign +Pre-Depends: ${misc:Pre-Depends}, + multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends}, dbus-x11, - libcap2-bin [linux-any] + libcap2-bin [linux-any], + libp11-kit-gnome-keyring Recommends: libpam-gnome-keyring Breaks: libgnome-keyring0 (<< 3.0), seahorse-plugins (<< 3.0) @@ -44,9 +48,30 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. +Package: libp11-kit-gnome-keyring +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends}, + multiarch-support +Depends: ${misc:Depends}, + ${shlibs:Depends} +Breaks: gnome-keyring (<< ${binary:Version}) +Replaces: gnome-keyring (<< ${binary:Version}) +Description: GNOME keyring module for the PKCS#11 module loading library + gnome-keyring is a daemon in the session, similar to ssh-agent, + and other applications can use it to store passwords and other + sensitive information. + . + This package contains a PKCS#11 module that will allow using the GNOME + keyring as a certificate database. + 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) @@ -101,6 +126,9 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, + multiarch-support +Multi-Arch: same Description: Glib wrapper library for PKCS#11 - runtime GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) interface. @@ -146,6 +174,9 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libgcr-3-common +Pre-Depends: ${misc:Pre-Depends}, + multiarch-support +Multi-Arch: same Description: Library for Crypto UI related task - runtime GCR is a library for crypto UI and related tasks. . @@ -158,6 +189,7 @@ Depends: ${misc:Depends} Replaces: libgcr-3-1 (<< 3.2.2-1) Breaks: libgcr-3-1 (<< 3.2.2-1) +Multi-Arch: foreign Description: Library for Crypto UI related task - common files GCR is a library for crypto UI and related tasks. . diff -Nru gnome-keyring-3.2.2/debian/gnome-keyring.install gnome-keyring-3.2.2/debian/gnome-keyring.install --- gnome-keyring-3.2.2/debian/gnome-keyring.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/gnome-keyring.install 2013-07-06 11:27:56.000000000 +0200 @@ -8,7 +8,5 @@ usr/share/GConf/gsettings usr/share/gnome-keyring-3/ui usr/lib/gnome-keyring/gnome-keyring-prompt* -usr/lib/gnome-keyring/devel/*.so -usr/lib/*/pkcs11/*.so +usr/lib/*/gnome-keyring/devel/*.so /usr/lib/gnome-keyring/devel etc/xdg/autostart -etc/pkcs11 diff -Nru gnome-keyring-3.2.2/debian/libgck-1-0.install gnome-keyring-3.2.2/debian/libgck-1-0.install --- gnome-keyring-3.2.2/debian/libgck-1-0.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libgck-1-0.install 2013-06-25 12:30:03.000000000 +0200 @@ -1 +1 @@ -usr/lib/libgck-1.so.* +usr/lib/*/libgck-1.so.* diff -Nru gnome-keyring-3.2.2/debian/libgck-1-dev.install gnome-keyring-3.2.2/debian/libgck-1-dev.install --- gnome-keyring-3.2.2/debian/libgck-1-dev.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libgck-1-dev.install 2013-06-25 12:29:47.000000000 +0200 @@ -1,4 +1,4 @@ usr/include/gck-1 -usr/lib/libgck-1.a -usr/lib/libgck-1.so -usr/lib/pkgconfig/gck-1.pc +usr/lib/*/libgck-1.a +usr/lib/*/libgck-1.so +usr/lib/*/pkgconfig/gck-1.pc diff -Nru gnome-keyring-3.2.2/debian/libgcr-3-1.install gnome-keyring-3.2.2/debian/libgcr-3-1.install --- gnome-keyring-3.2.2/debian/libgcr-3-1.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libgcr-3-1.install 2013-06-25 12:30:16.000000000 +0200 @@ -1 +1 @@ -usr/lib/libgcr-3.so.* +usr/lib/*/libgcr-3.so.* diff -Nru gnome-keyring-3.2.2/debian/libgcr-3-dev.install gnome-keyring-3.2.2/debian/libgcr-3-dev.install --- gnome-keyring-3.2.2/debian/libgcr-3-dev.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libgcr-3-dev.install 2013-06-25 12:30:41.000000000 +0200 @@ -1,4 +1,4 @@ usr/include/gcr-3 -usr/lib/libgcr-3.a -usr/lib/libgcr-3.so -usr/lib/pkgconfig/gcr-3.pc +usr/lib/*/libgcr-3.a +usr/lib/*/libgcr-3.so +usr/lib/*/pkgconfig/gcr-3.pc diff -Nru gnome-keyring-3.2.2/debian/libp11-kit-gnome-keyring.install gnome-keyring-3.2.2/debian/libp11-kit-gnome-keyring.install --- gnome-keyring-3.2.2/debian/libp11-kit-gnome-keyring.install 1970-01-01 02:00:00.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libp11-kit-gnome-keyring.install 2013-06-24 12:42:00.000000000 +0200 @@ -0,0 +1,2 @@ +etc/pkcs11 +usr/lib/*/pkcs11/*.so diff -Nru gnome-keyring-3.2.2/debian/libpam-gnome-keyring.install gnome-keyring-3.2.2/debian/libpam-gnome-keyring.install --- gnome-keyring-3.2.2/debian/libpam-gnome-keyring.install 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/libpam-gnome-keyring.install 2013-06-24 12:42:00.000000000 +0200 @@ -1,2 +1,2 @@ -lib/security/*.so +lib/*/security/*.so debian/pam-configs usr/share/ diff -Nru gnome-keyring-3.2.2/debian/rules gnome-keyring-3.2.2/debian/rules --- gnome-keyring-3.2.2/debian/rules 2012-04-12 15:15:09.000000000 +0200 +++ gnome-keyring-3.2.2/debian/rules 2013-06-25 11:50:32.000000000 +0200 @@ -11,8 +11,9 @@ #DEB_MAKE_CHECK_TARGET := -k check || true -DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \ - --with-pam-dir=/lib/security \ +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --enable-static \ + --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \ --enable-gtk-doc \ --disable-update-mime