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 11:06:19.000000000 -0500 +++ gnome-keyring-3.2.2/debian/changelog 2013-04-08 12:09:25.000000000 -0400 @@ -1,3 +1,16 @@ +gnome-keyring (3.2.2-2ubuntu4.2) precise-proposed; urgency=low + + [ Rodney Dawes ] + * debian/control: + - Move the PKCS#11 module into a separate package. (LP: #1094319) + - Convert to use multi-arch. (LP: #859600) + * debian/gnome-keyring.install, debian/libp11-kit-gnome-keyring.*: + - The pkcs11 module needs to be a separate package. + * debian/libpam-gnome-keyring.install, debian/rules: + - Use the multi-arch directory for the PAM module. + + -- Adam Stokes Mon, 08 Apr 2013 12:08:53 -0400 + 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 gnome-keyring-3.2.2/debian/control --- gnome-keyring-3.2.2/debian/control 2013-03-08 11:06:24.000000000 -0500 +++ gnome-keyring-3.2.2/debian/control 2013-04-08 12:12:11.000000000 -0400 @@ -7,10 +7,10 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Michael Biebl , Sjoerd Simons -Build-Depends: debhelper (>= 8), +Uploaders: Debian GNOME Maintainers , Michael Biebl +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), @@ -32,11 +32,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] -Recommends: libpam-gnome-keyring +Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring Breaks: libgnome-keyring0 (<< 3.0), seahorse-plugins (<< 3.0) Description: GNOME keyring services (daemon and tools) @@ -48,9 +51,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 (<< 3.6.2-0ubuntu2~) +Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~) +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) 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 09:15:09.000000000 -0400 +++ gnome-keyring-3.2.2/debian/control.in 2013-04-08 12:08:24.000000000 -0400 @@ -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,11 +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] -Recommends: libpam-gnome-keyring +Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring Breaks: libgnome-keyring0 (<< 3.0), seahorse-plugins (<< 3.0) Description: GNOME keyring services (daemon and tools) @@ -44,9 +47,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 (<< 3.6.2-0ubuntu2~) +Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~) +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) 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 09:15:09.000000000 -0400 +++ gnome-keyring-3.2.2/debian/gnome-keyring.install 2013-04-08 12:08:32.000000000 -0400 @@ -9,6 +9,4 @@ usr/share/gnome-keyring-3/ui usr/lib/gnome-keyring/gnome-keyring-prompt* usr/lib/gnome-keyring/devel/*.so -usr/lib/*/pkcs11/*.so etc/xdg/autostart -etc/pkcs11 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 1969-12-31 19:00:00.000000000 -0500 +++ gnome-keyring-3.2.2/debian/libp11-kit-gnome-keyring.install 2013-03-15 07:50:02.000000000 -0400 @@ -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 09:15:09.000000000 -0400 +++ gnome-keyring-3.2.2/debian/libpam-gnome-keyring.install 2013-04-08 12:08:41.000000000 -0400 @@ -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 09:15:09.000000000 -0400 +++ gnome-keyring-3.2.2/debian/rules 2013-04-08 12:08:47.000000000 -0400 @@ -12,7 +12,7 @@ #DEB_MAKE_CHECK_TARGET := -k check || true DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \ - --with-pam-dir=/lib/security \ + --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \ --enable-gtk-doc \ --disable-update-mime