r36007 - in /desktop/experimental/gnome-keyring/debian: ./ patches/

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Oct 20 16:27:28 2012
New Revision: 36007

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36007
Log:
* New upstream release
  - update build-dependencies
  - drop patches that are in the upstream version
  - deal with renamed PKCS#11 integration conffile with a mv_conffile
    maintscript helper (LP: #1038577)
* Upload to Debian (Closes: #690965)

Added:
    desktop/experimental/gnome-keyring/debian/gnome-keyring.maintscript
Removed:
    desktop/experimental/gnome-keyring/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch
    desktop/experimental/gnome-keyring/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch
    desktop/experimental/gnome-keyring/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/control
    desktop/experimental/gnome-keyring/debian/control.in
    desktop/experimental/gnome-keyring/debian/patches/series

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=36007&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Sat Oct 20 16:27:28 2012
@@ -1,3 +1,17 @@
+gnome-keyring (3.6.1-1) experimental; urgency=low
+
+  [ Simon McVittie ]
+  * New upstream release
+    - update build-dependencies
+    - drop patches that are in the upstream version
+    - deal with renamed PKCS#11 integration conffile with a mv_conffile
+      maintscript helper (LP: #1038577)
+
+  [ Sjoerd Simons ]
+  * Upload to Debian (Closes: #690965)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 20 Oct 2012 18:15:10 +0200
+
 gnome-keyring (3.4.1-5) unstable; urgency=low
 
   * d/p/0001-schema-Update-description-for-gpg-cache-method.patch,

Modified: desktop/experimental/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control?rev=36007&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control [utf-8] Sat Oct 20 16:27:28 2012
@@ -18,9 +18,9 @@
                libcap-ng-dev [linux-any],
                libdbus-1-dev (>= 1.0),
                libgck-1-dev (>= 3.3.4),
-               libgcr-3-dev (>= 3.3.3),
+               libgcr-3-dev (>= 3.5.3),
                libgcrypt11-dev (>= 1.2.2),
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.32.0),
                libgtk-3-dev (>= 3.0),
                libp11-kit-dev (>= 0.6),
                libpam0g-dev,
@@ -35,6 +35,7 @@
 
 Package: gnome-keyring
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gcr (>= 3.4),

Modified: desktop/experimental/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control.in?rev=36007&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control.in [utf-8] Sat Oct 20 16:27:28 2012
@@ -13,9 +13,9 @@
                libcap-ng-dev [linux-any],
                libdbus-1-dev (>= 1.0),
                libgck-1-dev (>= 3.3.4),
-               libgcr-3-dev (>= 3.3.3),
+               libgcr-3-dev (>= 3.5.3),
                libgcrypt11-dev (>= 1.2.2),
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.32.0),
                libgtk-3-dev (>= 3.0),
                libp11-kit-dev (>= 0.6),
                libpam0g-dev,
@@ -30,6 +30,7 @@
 
 Package: gnome-keyring
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gcr (>= 3.4),

Added: desktop/experimental/gnome-keyring/debian/gnome-keyring.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/gnome-keyring.maintscript?rev=36007&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.maintscript (added)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.maintscript [utf-8] Sat Oct 20 16:27:28 2012
@@ -1,0 +1,1 @@
+mv_conffile /etc/pkcs11/modules/gnome-keyring-module /etc/pkcs11/modules/gnome-keyring.module 3.6.0-0ubuntu1~

Modified: desktop/experimental/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/series?rev=36007&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/series [utf-8] Sat Oct 20 16:27:28 2012
@@ -1,4 +1,1 @@
 03_kfreebsd.patch
-0001-schema-Update-description-for-gpg-cache-method.patch
-0002-gpg-agent-Hook-up-the-TTL-cache-option.patch
-0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch