Merge lp:~mterry/gnome-system-tools/ubuntu-2.32.0 into lp:~ubuntu-desktop/gnome-system-tools/ubuntu

Proposed by Michael Terry
Status: Merged
Merged at revision: 54
Proposed branch: lp:~mterry/gnome-system-tools/ubuntu-2.32.0
Merge into: lp:~ubuntu-desktop/gnome-system-tools/ubuntu
Diff against target: 24 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~mterry/gnome-system-tools/ubuntu-2.32.0
Reviewer Review Type Date Requested Status
VCS imports Pending
Review via email: mp+36767@code.launchpad.net

Description of the change

GNOME 2.32.0 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-13 16:06:20 +0000
3+++ debian/changelog 2010-09-27 18:14:39 +0000
4@@ -1,3 +1,11 @@
5+gnome-system-tools (2.32.0-0ubuntu1) maverick; urgency=low
6+
7+ * New upstream release
8+ * debian/watch:
9+ - Update version matcher to work
10+
11+ -- Michael Terry <mike@mterry.name> Mon, 27 Sep 2010 14:11:27 -0400
12+
13 gnome-system-tools (2.31.92-0ubuntu1) maverick; urgency=low
14
15 * New upstream release:
16
17=== modified file 'debian/watch'
18--- debian/watch 2009-12-14 02:56:13 +0000
19+++ debian/watch 2010-09-27 18:14:39 +0000
20@@ -1,3 +1,3 @@
21 version=2
22-http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/([\d\.]+)[0-9]/ \
23+http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/([\d\.]+[0-9])/ \
24 gnome-system-tools-(.*)\.tar\.gz

Subscribers

People subscribed via source and target branches