Gconf Editor

Merge lp:~jbicha/gconf-editor/gconf-editor-3 into lp:~ubuntu-desktop/gconf-editor/ubuntu

  1. gconf-editor-3
  2. Merge into ubuntu
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 20
Proposed branch: lp:~jbicha/gconf-editor/gconf-editor-3
Merge into: lp:~ubuntu-desktop/gconf-editor/ubuntu
Diff against target: 20 lines (+13/-0)
1 file modified
debian/changelog (+13/-0)
To merge this branch: bzr merge lp:~jbicha/gconf-editor/gconf-editor-3
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+61498@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Jeremy, I've merged it but I've also added the debian changelog entry for 3.0.0-1 to the changelog since if you rebase on that version it should be in the source ;-)

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 2011-05-16 13:59:43 +0000
3+++ debian/changelog 2011-05-19 00:44:23 +0000
4@@ -1,3 +1,16 @@
5+gconf-editor (3.0.0-1ubuntu1) oneiric; urgency=low
6+
7+ * No change sync with Debian experimental, remaining changes:
8+ * debian/control
9+ - Build-depends on dh-autoreconf and liblaunchpad-integration-3.0-dev
10+ * debian/patches/01_lpi.patch
11+ * debian/rules
12+ - Use autoreconf
13+ * debian/watch
14+ - watch unstable
15+
16+ -- Jeremy Bicha <jeremy@bicha.net> Wed, 18 May 2011 20:33:57 -0400
17+
18 gconf-editor (3.0.0-0ubuntu1) oneiric; urgency=low
19
20 * Updated to the GNOME3 version using the ppa work,

Subscribers

People subscribed via source and target branches

to all changes: