From 1b34646229da68910edc1a7401778f28fd12dfc9 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 26 Oct 2012 19:23:06 +0000 Subject: [PATCH] Fixed get-vcs-source target. Rewritten-From: 1c5be682b144ff6af56d9c71952710594cab7178 --- trusty/debian/rules | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/trusty/debian/rules b/trusty/debian/rules index 1e7e4f4..12a6305 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -3,6 +3,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') +DEBFLAVOR :=$(shell dpkg-parsechangelog | grep -E ^Distribution: | cut -d" " -f2) +DEBPKGNAME :=$(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f2) + %: dh $@ --with python2 @@ -45,11 +50,13 @@ override_dh_auto_clean: rm -rf $(CURDIR)/openstack_dashboard/openstack_dashboard.egg-info get-vcs-source: - git remote add upstream git://github.com/openstack/horizon.git || true + git remote add upstream git://github.com/openstack/$(DEBPKGNAME).git || true git fetch upstream - git archive --prefix=horizon-2012.1.1/ 2012.1.1 | xz >../horizon_2012.1.1.orig.tar.xz + if [ ! -f ../$(DEBPKGNAME)_$(VERSION).orig.tar.xz ] ; then \ + git archive --prefix=$(DEBPKGNAME)-$(VERSION)/ $(VERSION) | xz >../$(DEBPKGNAME)_$(VERSION).orig.tar.xz ; \ + fi if ! git checkout master ; then \ echo "No upstream branch: checking out" ; \ git checkout -b master upstream/master ; \ fi - git checkout debian/unstable + git checkout debian/experimental -- 2.45.2