libgnome-keyring

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

  1. ubuntu-2.31.92
  2. Merge into ubuntu
Proposed by Michael Terry
Status: Merged
Merged at revision: 4
Proposed branch: lp:~mterry/libgnome-keyring/ubuntu-2.31.92
Merge into: lp:~ubuntu-desktop/libgnome-keyring/ubuntu
Diff against target: 26 lines (+11/-2)
2 files modified
debian/changelog (+9/-0)
debian/watch (+2/-2)
To merge this branch: bzr merge lp:~mterry/libgnome-keyring/ubuntu-2.31.92

Description of the change

GNOME 2.31.92 merge

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-01 03:39:28 +0000
3+++ debian/changelog 2010-09-27 15:47:00 +0000
4@@ -1,3 +1,12 @@
5+libgnome-keyring (2.31.92-0ubuntu1) maverick; urgency=low
6+
7+ * New upstream release
8+ * debian/watch:
9+ - Look for libgnome-keyring, not gnome-keyring
10+ - Look for unstable releases too
11+
12+ -- Michael Terry <mike@mterry.name> Mon, 27 Sep 2010 11:44:28 -0400
13+
14 libgnome-keyring (2.31.91-0ubuntu1) maverick; urgency=low
15
16 * New upstream release
17
18=== modified file 'debian/watch'
19--- debian/watch 2010-09-01 03:33:00 +0000
20+++ debian/watch 2010-09-27 15:47:00 +0000
21@@ -1,3 +1,3 @@
22 version=2
23-http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/([\d\.]+)[02468]/ \
24- gnome-keyring-(.*)\.tar\.gz
25+http://ftp.gnome.org/pub/GNOME/sources/libgnome-keyring/([\d\.]+)/ \
26+ libgnome-keyring-(.*)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: