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

[Jeremy Bícha]

[Sebastien Bacher (seb128)]

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 ;-)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-16 13:59:43 +0000
+++ debian/changelog	2011-05-19 00:44:23 +0000
@@ -1,3 +1,16 @@
+gconf-editor (3.0.0-1ubuntu1) oneiric; urgency=low
+
+  * No change sync with Debian experimental, remaining changes:
+  * debian/control
+    - Build-depends on dh-autoreconf and liblaunchpad-integration-3.0-dev
+  * debian/patches/01_lpi.patch
+  * debian/rules
+    - Use autoreconf
+  * debian/watch
+    - watch unstable
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 18 May 2011 20:33:57 -0400
+
 gconf-editor (3.0.0-0ubuntu1) oneiric; urgency=low
 
   * Updated to the GNOME3 version using the ppa work,