gnome-control-center

Merge lp:~mterry/gnome-control-center/ubuntu-2.32.0 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Michael Terry on 2010-09-27

Status:	Merged
Merged at revision:	187
Proposed branch:	lp:~mterry/gnome-control-center/ubuntu-2.32.0
Merge into:	lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target:	26 lines (+7/-1) 2 files modified debian/changelog (+6/-0) debian/control (+1/-1)
To merge this branch:	bzr merge lp:~mterry/gnome-control-center/ubuntu-2.32.0
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
VCS imports		2010-09-27	Pending
Review via email: mp+36732@code.launchpad.net

GNOME 2.32.0 merge

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2010-09-20 14:04:51 +0000
3	+++ debian/changelog 2010-09-27 14:58:43 +0000
4	@@ -1,3 +1,9 @@
5	+gnome-control-center (1:2.32.0-0ubuntu1) maverick; urgency=low
6	+
7	+ * New upstream release.
8	+
9	+ -- Michael Terry <mike@mterry.name> Mon, 27 Sep 2010 10:54:11 -0400
10	+
11	gnome-control-center (1:2.31.92.1-0ubuntu1) maverick; urgency=low
12
13	* New upstream release:
14
15	=== modified file 'debian/control'
16	--- debian/control 2010-09-01 07:51:56 +0000
17	+++ debian/control 2010-09-27 14:58:43 +0000
18	@@ -8,7 +8,7 @@
19	Priority: optional
20	Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
21	XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
22	-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>
23	+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>
24	Standards-Version: 3.8.3
25	Build-Depends: cdbs (>= 0.4.41),
26	gnome-pkg-tools (>= 0.10),