Merge lp:~james-page/nova/fix-watch-file into lp:~openstack-ubuntu-testing/nova/grizzly

[James Page]

Fixup watch file.

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-28 17:00:13 +0000
+++ debian/changelog	2013-03-01 14:26:22 +0000
@@ -1,5 +1,6 @@
 nova (2013.1.a4723.ge807e19-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream release.
   * debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
   * debian/control: Clean up dependencies:
@@ -11,6 +12,10 @@
     - Dropped python-tempita no longer needed.
     - Dropped python-xattr no longer needed.
 
+  [ James Page ]
+  * d/watch: Update uversionmangle to deal with upstream versioning
+    changes, remove tarballs.openstack.org. 
+
  -- Chuck Short <[e-mail]>  Thu, 28 Feb 2013 09:00:15 -0600
 
 nova (2013.1.g3-0ubuntu1) raring; urgency=low

=== modified file 'debian/watch'
--- debian/watch	2012-08-29 14:13:07 +0000
+++ debian/watch	2013-03-01 14:26:22 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/%7E/~/" https://launchpad.net/nova/+download https://launchpad.net/nova/.*/.*/.*/nova-(.*)\.tar\.gz
-http://tarballs.openstack.org/nova/ nova-(\d.*).tar.gz
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/nova/+download https://launchpad.net/nova/.*/.*/.*/nova-(.*)\.tar\.gz