Merge lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions into lp:~openstack-ubuntu-testing/nova/havana

[Adam Gandelman]

Drops the patch that sets version requirements in setup.py. Moves to d/control and sets pbr dependency to meet 0.5.11, which nova at least now requires, or it will fail:

2013-06-14 23:52:18,438: hook.output@INFO: Traceback (most recent call last):
  File "/usr/bin/nova-manage", line 5, in <module>
    from pkg_resources import load_entry_point
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2711, in <module>

2013-06-14 23:52:18,438: hook.output@INFO: parse_requirements(__requires__), Environment()
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 588, in resolve

2013-06-14 23:52:18,438: hook.output@INFO: raise VersionConflict(dist,req) # XXX put more info here
pkg_resources.VersionConflict: (pbr 0.5.11 (/usr/lib/python2.7/dist-packages), Requirement.parse('pbr>=0.5.16,<0.6'))

2013-06-14 23:52:18,445: hook.output@INFO: dpkg: error processing nova-common (--configure):

[lp:~gandelman-a/ubuntu/saucy/nova/pbr_d2to1_versions]

582. By Chuck Short on 2013-06-17

Dropped fix-setup-version-dependency.patch

583. By Adam Gandelman on 2013-06-19

Fix changelog conflict.

Unmerged revisions

583. By Adam Gandelman on 2013-06-19

Fix changelog conflict.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-03 14:51:39 +0000
+++ debian/changelog	2013-06-15 00:26:30 +0000
@@ -1,16 +1,13 @@
-nova (1:2013.2.a973.g0afcc05-0ubuntu1) UNRELEASED; urgency=low
-
-  * New upstream release.
-  * debian/patches/fix-setup-version-dependency.patch: Hard
-    code dependencies for pbr and d2to1. 
-
- -- Chuck Short <[e-mail]>  Mon, 03 Jun 2013 08:52:36 -0500
-
-nova (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
-
+nova (1:2013.2.a973.g0afcc05-0ubuntu2) UNRELEASED; urgency=low
+
+  [ Yolanda Robla ]
   * debian/tests: added autopkgtests
 
- -- Yolanda Robla <[e-mail]>  Mon, 03 Jun 2013 16:10:12 +0200
+  [ Adam Gandelman ]
+  * debian/control: Set version requirements python-pbr (>= 0.5.11),
+    python-d2to1 (>= 0.2.10).
+
+ -- Adam Gandelman <[e-mail]>  Fri, 14 Jun 2013 17:24:40 -0700
 
 nova (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-06-03 13:49:25 +0000
+++ debian/control	2013-06-15 00:26:30 +0000
@@ -17,7 +17,7 @@
  python-cinderclient,
  python-coverage,
  python-crypto,
- python-d2to1,
+ python-d2to1 (>= 0.2.10),
  python-distutils-extra,
  python-eventlet,
  python-fixtures (>= 0.3.12),
@@ -34,7 +34,7 @@
  python-paramiko,
  python-paste,
  python-pastedeploy (>= 1.5.0),
- python-pbr,
+ python-pbr (>= 0.5.11),
  python-pyasn1,
  python-quantumclient,
  python-routes,

=== removed file 'debian/patches/fix-setup-version-dependency.patch'
--- debian/patches/fix-setup-version-dependency.patch	2013-06-03 14:08:47 +0000
+++ debian/patches/fix-setup-version-dependency.patch	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-diff -Naupr nova-2013.2.a973.g0afcc05.orig/setup.py nova-2013.2.a973.g0afcc05/setup.py
---- nova-2013.2.a973.g0afcc05.orig/setup.py	2013-06-03 08:43:16.000000000 -0500
-+++ nova-2013.2.a973.g0afcc05/setup.py	2013-06-03 08:48:06.825292822 -0500
-@@ -17,5 +17,5 @@
- import setuptools
- 
- setuptools.setup(
--    setup_requires=['d2to1', 'pbr'],
-+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-     d2to1=True)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-03 14:08:47 +0000
+++ debian/patches/series	2013-06-15 00:26:30 +0000
@@ -3,4 +3,3 @@
 avoid_requirements_cheetah.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch
-fix-setup-version-dependency.patch