diff -Nru melange-2012.1/debian/changelog melange-2012.1/debian/changelog
--- melange-2012.1/debian/changelog	2012-06-12 20:02:00.000000000 +0000
+++ melange-2012.1/debian/changelog	2012-08-27 15:15:25.000000000 +0000
@@ -1,3 +1,14 @@
+melange (1:2012.1-3) unstable; urgency=low
+
+  * Added myself as uploader.
+  * Add Depends on python-melange for melange binary package (Closes: #684736).
+  * Added a get-vcs-source target in debian/rules.
+  * Added a debian/gbp.conf file.
+  * Fixed debian/copyright syntax and Format: URL.
+  * Fixed python-melange: capitalization-error-in-description python Python.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 27 Aug 2012 14:59:28 +0000
+
 melange (1:2012.1-2) unstable; urgency=low
 
   * rebuild to resolve depends on unavailable factory-boy (Closes: #663397).
diff -Nru melange-2012.1/debian/control melange-2012.1/debian/control
--- melange-2012.1/debian/control	2012-06-12 20:02:00.000000000 +0000
+++ melange-2012.1/debian/control	2012-08-27 15:15:25.000000000 +0000
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Loic Dachary (OuoU) <loic@debian.org>, 
-           Ghe Rivero <ghe.rivero@stackops.com>
+           Ghe Rivero <ghe.rivero@stackops.com>,
+           Thomas Goirand <zigo@debian.org>
 Build-Depends: debhelper (>= 7.0.50),
  python-all (>= 2.6.6-3~)
 Build-Depends-Indep:
@@ -30,7 +31,7 @@
 
 Package: melange
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser, python-melange (= ${source:Version})
 Description: IPAM management service for Openstack - Daemons
  Melange is a network information service that provides a centralized
  mechanism for managing IPs, MAC addresses and other information that
@@ -58,4 +59,4 @@
  needs to be shared across multiple openstack services
  (Nova zones, Atlas, Quantum).
  .
- This package contains the python libraries.
\ No newline at end of file
+ This package contains the Python libraries.
\ No newline at end of file
diff -Nru melange-2012.1/debian/copyright melange-2012.1/debian/copyright
--- melange-2012.1/debian/copyright	2012-06-12 20:02:00.000000000 +0000
+++ melange-2012.1/debian/copyright	2012-08-27 15:15:25.000000000 +0000
@@ -1,11 +1,11 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: melange
 Source: http://openstack.org/openstack/melange
 
 Files: *
 Copyright: 2010 United States Government as represented by the Administrator of the National Aeronautics and Space Administration.
-Copyright: 2010-2011 OpenStack LLC
-Copyright: Others (See individual files for more details)
+	2010-2011 OpenStack LLC
+	Others (See individual files for more details)
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff -Nru melange-2012.1/debian/gbp.conf melange-2012.1/debian/gbp.conf
--- melange-2012.1/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ melange-2012.1/debian/gbp.conf	2012-08-27 15:15:25.000000000 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian/unstable
+upstream-tag = %(version)s
+compression = xz
+
+[git-buildpackage]
+export-dir = ../build-area/
diff -Nru melange-2012.1/debian/rules melange-2012.1/debian/rules
--- melange-2012.1/debian/rules	2012-06-12 20:02:00.000000000 +0000
+++ melange-2012.1/debian/rules	2012-08-27 15:15:25.000000000 +0000
@@ -12,4 +12,16 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	cp $(CURDIR)/etc/melange/melange.conf.sample $(CURDIR)/debian/melange/etc/melange/melange.conf
\ No newline at end of file
+	cp $(CURDIR)/etc/melange/melange.conf.sample $(CURDIR)/debian/melange/etc/melange/melange.conf
+
+get-vcs-source:
+	git remote add upstream git://github.com/openstack/melange.git || true
+	git fetch upstream
+	if ! [ -e ../melange_2012.1.orig.tar.xz ] ; then \
+		git archive --prefix=melange-2012.1/ 2012.1 | xz >../melange_2012.1.orig.tar.xz ; \
+	fi
+	if ! git checkout master ; then \
+		echo "No upstream branch: checking out" ; \
+		git checkout -b master upstream/master ; \
+	fi
+	git checkout debian/unstable
