r13567 - in /desktop/unstable/gnome-keyring/debian: changelog control

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sun Nov 25 13:41:24 2007
New Revision: 13567

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13567
Log:
* debian/control.in:
  - libpam-gnome-keyring Conflicts,Provides,Replaces libpam-keyring
* New upstream bugfix release.

Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/control

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=13567&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog (original)
+++ desktop/unstable/gnome-keyring/debian/changelog Sun Nov 25 13:41:24 2007
@@ -1,17 +1,19 @@
-gnome-keyring (2.20.1-3) UNRELEASED; urgency=low
-
+gnome-keyring (2.20.2-1) unstable; urgency=low
+
+  [ Sebastien Bacher ]
+
+  * debian/control.in:
+    - libpam-gnome-keyring Conflicts,Provides,Replaces libpam-keyring
+
+  [ Josselin Mouette ]
   * libpam-gnome-keyring.README.Debian: document how to configure
     pam_gnome_keyring in Debian. Closes: #452731.
   * gnome-keyring recommends libpam-gnome-keyring.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 25 Nov 2007 11:50:02 +0100
-
-gnome-keyring (2.20.1-2) unstable; urgency=low
-
-  * debian/control.in:
-    - libpam-gnome-keyring Conflicts,Provides,Replaces libpam-keyring
-
- -- Sebastien Bacher <seb128 at debian.org>  Thu, 15 Nov 2007 11:01:46 +0100
+  [ Sebastian Dröge ]
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 25 Nov 2007 14:40:12 +0100
 
 gnome-keyring (2.20.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=13567&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control (original)
+++ desktop/unstable/gnome-keyring/debian/control Sun Nov 25 13:41:24 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Norbert Tretkowski <nobse at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Norbert Tretkowski <nobse at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5), gnome-pkg-tools (>= 0.10), libgtk2.0-dev (>= 2.6.0), cdbs, gtk-doc-tools, docbook-xml, libdbus-1-dev (>= 1.0), libgcrypt11-dev, libhal-storage-dev (>= 0.5.7), libpam0g-dev
 Standards-Version: 3.7.2
 
@@ -54,6 +54,9 @@
 Section: admin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libpam-keyring
+Replaces: libpam-keyring
+Provides: libpam-keyring
 Description: GNOME keyring services PAM module
  gnome-keyring is a daemon in the session, similar to ssh-agent,
  and other applications can use it to store passwords and other