Merge lp:~zulcss/python-ceilometerclient/1.0.0 into lp:~openstack-ubuntu-testing/python-ceilometerclient/grizzly

[Chuck Short]

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-28 12:49:39 +0000
+++ debian/changelog	2013-03-28 13:27:21 +0000
@@ -1,3 +1,14 @@
+python-ceilometerclient (1.0.0-0ubuntu1) raring; urgency=low
+
+  * New upstream version. 
+  * debian/rules, debian/watch: Add watch file.
+  * debian/control: 
+    - Dropped python-warlock no longer needed.
+    - Added python-setuptools-git.
+  * debian/rules: Run testsuite during build.
+
+ -- Chuck Short <[e-mail]>  Thu, 28 Mar 2013 08:23:31 -0500
+
 python-ceilometerclient (0.1~dde86a3-0ubuntu1) raring; urgency=low
 
   * Initial release.

=== modified file 'debian/control'
--- debian/control	2013-03-28 12:49:39 +0000
+++ debian/control	2013-03-28 13:27:21 +0000
@@ -5,9 +5,9 @@
 Build-Depends: debhelper (>= 8.0.0), 
  python-all (>= 2.6.6-3~),
  python-setuptools,
+ python-setuptools-git,
  python-prettytable,
  python-keystoneclient,
- python-warlock,
  python-httplib2,
  python-iso8601,
  python-mox,
@@ -23,7 +23,6 @@
 Architecture: all
 Depends: python-prettytable,
  python-keystoneclient,
- python-warlock,
  python-httplib2,
  python-iso8601, 
  ${python:Depends}, 

=== modified file 'debian/rules'
--- debian/rules	2013-03-28 12:49:39 +0000
+++ debian/rules	2013-03-28 13:27:21 +0000
@@ -5,3 +5,11 @@
 
 %:
 	dh $@  --with python2
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	nosetests
+endif
+
+get-orig-source:
+	uscan --verbose --force-download --rename --destdir=../build-area

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2013-03-28 13:27:21 +0000
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/p/python-ceilometerclient python-ceilometerclient-(.*)\.tar.gz