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

[Chuck Short]

allows developer to generate a tarball from github locally for package testing.

[Adam Gandelman (gandelman-a)]

It would be cool if the version info (2013.1 and/or 'g3') didn't have to be hard-coded in debian/rules. I believe all of the projects now have a $project/version.py file that can be loaded as a python module and used to get the version + other info about the build, eg:

git clone nova
cd nova/
python -c 'import nova.version; print nova.version.canonical_version_string()

Also, is there some way to override the remote branch location and branch from a local repository if desired? A fresh nova remote clone can take ~10 minutes. I usually have a local branch tracking the remote, it would be nice to optionally use that instead of the remote.

Unmerged revisions

542. By Chuck Short on 2013-01-14

* New upstream version
* debian/rules: Update get-vcs-source so that it fetches the
  source from github and creates a version tarballs for us.

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-11 19:07:00 +0000
+++ debian/changelog	2013-01-14 15:47:22 +0000
@@ -1,3 +1,11 @@
+nova (2013.1~g3~20130114.ca4b130-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream version 
+  * debian/rules: Update get-vcs-source so that it fetches the 
+    source from github and creates a version tarballs for us.
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Jan 2013 09:16:37 -0600
+
 nova (2013.1~g2-0ubuntu1) raring; urgency=low
 
   [ Chuck Short ]
 
=== modified file 'debian/rules'
--- debian/rules	2013-01-10 19:20:37 +0000
+++ debian/rules	2013-01-14 15:47:22 +0000
@@ -36,9 +36,19 @@
 	uscan --verbose --rename --destdir=../build-area
 
 version_prefix := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+git_url := git://github.com/openstack/nova.git
+tarball_version := 2013.1
+date := $(shell date +%Y%m%d)
+
 get-vcs-source:
-	wget http://tarballs.openstack.org/nova/nova-master.tar.gz \
-		 -O ../nova_$(version_prefix).orig.tar.gz
+	# Grab the latest snapshot of the upstream git repository
+	[ ! -d nova-snapshot ] || rm -rf nova-snapshot
+	git clone git://github.com/openstack/nova.git nova-snapshot
+	cd nova-snapshot && \
+            commit=`git rev-parse --short HEAD` && \
+			python setup.py sdist && \
+			cp dist/nova-$(tarball_version).tar.gz ../../nova_$(tarball_version)~g3~$(date).$${commit}.orig.tar.gz && \
+	rm -rf nova-snapshot
 
 override_dh_install:
 	dh_install --fail-missing -Xbin/nova-all