From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 16 Nov 2012 14:44:03 +0000 (+0000)
Subject: Now using include pkgos.make
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5d6cba3f1651e62c4eb7f6fb6b5f1df91b147e80;p=openstack-build%2Fceilometer-build.git

Now using include pkgos.make

Rewritten-From: 155e50c5548b6d1c5bdc43a3916b8758b025e1b1
---

diff --git a/trusty/debian/control b/trusty/debian/control
index 883e61c..5e06783 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -9,6 +9,7 @@ Uploaders: Loic Dachary (OuoU) <loic@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
  python-all (>= 2.6.6-3~),
+ openstack-pkg-tools
 Build-Depends-Indep: pep8,
  python-anyjson, 
  python-eventlet,  
diff --git a/trusty/debian/rules b/trusty/debian/rules
index 6ea0301..3b2f83c 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -45,15 +45,3 @@ regen-manifest-patch:
 	git ls-files --no-empty-directory --exclude-standard nova | grep -v '.py$$' | sed -n 's/.*/include &/gp' >> MANIFEST.in
 	quilt refresh
 	quilt pop -a
-
-get-vcs-source:
-	git remote add upstream git://github.com/openstack/$(DEBPKGNAME).git || true
-	git fetch upstream
-	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/experimental