Merge lp:~zulcss/nova/nova-cleanup into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

fixes ftbfs and cleans up build-depends

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-22 15:27:32 +0000
+++ debian/changelog	2013-02-28 17:03:19 +0000
@@ -1,3 +1,18 @@
+nova (2013.1.a4723.ge807e19-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
+  * debian/control: Clean up dependencies:
+    - Dropped python-gflags no longer needed.
+    - Dropped python-daemon no longer needed.
+    - Dropped python-glance no longer needed.
+    - Dropped python-lockfile no longer needed.
+    - Dropped python-simplejson no longer needed.
+    - Dropped python-tempita no longer needed.
+    - Dropped python-xattr no longer needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 28 Feb 2013 09:00:15 -0600
+
 nova (2013.1.g3-0ubuntu1) raring; urgency=low
 
   [ Chuck Short ]
 
=== modified file 'debian/control'
--- debian/control	2013-02-20 16:01:42 +0000
+++ debian/control	2013-02-28 17:03:19 +0000
@@ -16,17 +16,13 @@
  python-cinderclient,
  python-coverage,
  python-crypto,
- python-daemon,
  python-distutils-extra,
  python-eventlet,
  python-fixtures (>= 0.3.12),
  python-feedparser,
- python-gflags,
- python-glance,
  python-glanceclient,
  python-iso8601,
  python-kombu,
- python-lockfile,
  python-lxml,
  python-migrate,
  python-mox,
@@ -41,16 +37,13 @@
  python-routes,
  python-setuptools,
  python-setuptools-git,
- python-simplejson,
  python-stevedore (>= 0.7.2),
  python-sphinx (>> 1.0),
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
  python-suds,
- python-tempita,
  python-testtools (>= 0.9.22),
  python-unittest2,
  python-webob (>= 1.2.3),
- python-xattr,
  pep8,
  testrepository ( >= 0.0.8)
 Build-Conflicts: python-cjson
 
=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2013-02-20 15:36:21 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2013-02-28 17:03:19 +0000
@@ -1,22 +1,11 @@
-diff -Naurp nova-2013.1.a4539.g032308c.orig/setup.py nova-2013.1.a4539.g032308c/setup.py
---- nova-2013.1.a4539.g032308c.orig/setup.py	2013-02-20 09:26:49.000000000 -0600
-+++ nova-2013.1.a4539.g032308c/setup.py	2013-02-20 09:34:57.313915950 -0600
-@@ -46,7 +46,6 @@ setuptools.setup(
-       dependency_links=depend_links,
-       include_package_data=True,
-       test_suite='nose.collector',
--      setup_requires=['setuptools_git>=0.4'],
-       scripts=['bin/nova-all',
-                'bin/nova-api',
-                'bin/nova-api-ec2',
-diff -Naurp nova-2013.1.a4539.g032308c.orig/tools/pip-requires nova-2013.1.a4539.g032308c/tools/pip-requires
---- nova-2013.1.a4539.g032308c.orig/tools/pip-requires	2013-02-20 09:26:49.000000000 -0600
-+++ nova-2013.1.a4539.g032308c/tools/pip-requires	2013-02-20 09:35:08.525916217 -0600
+diff -Naurp nova-2013.1.a4723.ge807e19.orig/tools/pip-requires nova-2013.1.a4723.ge807e19/tools/pip-requires
+--- nova-2013.1.a4723.ge807e19.orig/tools/pip-requires	2013-02-28 08:59:17.000000000 -0600
++++ nova-2013.1.a4723.ge807e19/tools/pip-requires	2013-02-28 09:01:41.143142227 -0600
 @@ -20,7 +20,6 @@ pyasn1
  Babel>=0.9.6
  iso8601>=0.1.4
  httplib2
 -setuptools_git>=0.4
  python-cinderclient>=1.0.1
- python-quantumclient>=2.1
+ python-quantumclient>=2.1.2
  python-glanceclient>=0.5.0,<2