Now using include pkgos.make

Rewritten-From: 155e50c5548b6d1c5bdc43a3916b8758b025e1b1

diff --git a/trusty/debian/control b/trusty/debian/control
index 883e61cbb4314b918b330219f8193194c5c358ee..5e067833170a52f474c55494cbd440b0920bbea0 100644 (file)
--- 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 6ea03010c31bc53023872b498deada5be90659eb..3b2f83c00ec0ede133981f480ab57c545c298716 100755 (executable)
--- 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