Merge lp:~mterry/libgnome-keyring/ubuntu-2.31.92 into lp:~ubuntu-desktop/libgnome-keyring/ubuntu

[Michael Terry]

GNOME 2.31.92 merge

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-01 03:39:28 +0000
+++ debian/changelog	2010-09-27 15:47:00 +0000
@@ -1,3 +1,12 @@
+libgnome-keyring (2.31.92-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+  * debian/watch:
+    - Look for libgnome-keyring, not gnome-keyring
+    - Look for unstable releases too
+
+ -- Michael Terry <[e-mail]>  Mon, 27 Sep 2010 11:44:28 -0400
+
 libgnome-keyring (2.31.91-0ubuntu1) maverick; urgency=low
 
   * New upstream release
 
=== modified file 'debian/watch'
--- debian/watch	2010-09-01 03:33:00 +0000
+++ debian/watch	2010-09-27 15:47:00 +0000
@@ -1,3 +1,3 @@
 version=2
-http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/([\d\.]+)[02468]/ \
-        gnome-keyring-(.*)\.tar\.gz
+http://ftp.gnome.org/pub/GNOME/sources/libgnome-keyring/([\d\.]+)/ \
+        libgnome-keyring-(.*)\.tar\.gz