Merge lp:~james-page/ubuntu/oneiric/python-novaclient/825127 into lp:~openstack-ubuntu-packagers/python-novaclient/ubuntu

[James Page]

Updates for Ubuntu MIR

[James Page (james-page)]

Not updates to latest snapshot as fails test suite.

[Chuck Short (zulcss)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-12 09:42:28 +0000
+++ debian/changelog	2011-08-18 12:46:23 +0000
@@ -1,7 +1,16 @@
-python-novaclient (2.6.1~bzr78-0ubunt1) oneiric; urgency=low
+python-novaclient (2.6.1~bzr78-0ubuntu1) oneiric; urgency=low
 
+  [ Chuck Short ]
   * New upstream version. 
 
+  [ James Page ]
+  * Updates to support Ubuntu MIR (LP: #825127):
+    - debian/rules:
+      - Completed dh_python2 transition.
+      - Enabled test suite.
+    - debian/control:
+      - Bumped Standards-Version: 3.9.2, no changes.
+
  -- Chuck Short <[e-mail]>  Fri, 12 Aug 2011 05:42:22 -0400
 
 python-novaclient (2.6.1~bzr74-0ubuntu1) oneiric; urgency=low

=== modified file 'debian/control'
--- debian/control	2011-08-08 16:46:25 +0000
+++ debian/control	2011-08-18 12:46:23 +0000
@@ -11,7 +11,7 @@
  python-mock,
  python-httplib2
 X-Python-Version: >= 2.5
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: python-novaclient
 Architecture: all

=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2011-08-08 16:46:25 +0000
+++ debian/rules	2011-08-18 12:46:23 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
-
-
+	dh $@ --with python2
+
+override_dh_auto_test::
+	python setup.py test