Bug#686320: unblock: melange/1:2012.1-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package melange. This fixes RC bug #684736,
plus few minor fixes:
* Added myself as uploader.
* Add Depends on python-melange for melange binary package (Closes: #684736).
* Fixed debian/copyright syntax and Format: URL.
* Fixed python-melange: capitalization-error-in-description python Python.
Diff file attached.
Please unblock melange/1:2012.1-3
Cheers,
Thomas Goirand (zigo)
diff --git a/debian/changelog b/debian/changelog
index 267745d..b2a61aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+melange (1:2012.1-3) unstable; urgency=low
+
+ * Added myself as uploader.
+ * Add Depends on python-melange for melange binary package (Closes: #684736).
+ * 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 --git a/debian/control b/debian/control
index b2ab6b0..356e4fd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: net
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 @@ Vcs-Git: git://anonscm.debian.org/openstack/melange.git
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 @@ Description: IPAM management service for Openstack - Python library
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 --git a/debian/copyright b/debian/copyright
index 20190ba..8cb9478 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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 --git a/debian/rules b/debian/rules
index c64799f..b041e90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,4 +12,4 @@ override_dh_auto_clean:
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
Reply to: