The package had only Build-Depends:, now setting lots of them in Build-Depends-Indep...

Rewritten-From: ae01f18fd552140ed8d84ee4a4ec6a7194cb30dd

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index fc8007ae456eb366079b79f56d4e9048e3bb4a45..253308631071e2b8ef56b221ff09eb6000e928b8 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -12,6 +12,8 @@ horizon (2012.2-1) experimental; urgency=low
   * Now asking using debconf if we should disable the default apache vhost,
   and activate the Dasboard, and if we should use SSL or not.
   * Added missing dependency on node-less.
+  * The package had only Build-Depends:, now setting lots of them in
+  Build-Depends-Indep: as it should be.
 
  -- Mehdi Abaakouk <sileht@sileht.net>  Sat, 29 Sep 2012 09:38:19 +0200
 

diff --git a/xenial/debian/compat b/xenial/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/xenial/debian/compat
+++ b/xenial/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/xenial/debian/control b/xenial/debian/control
index fccff7070ba786a09483198423b8ae038c2a3f8a..746e3fa1a7fecbecbcb22c67a4b28513ab07d681 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -7,7 +7,10 @@ Uploaders: Loic Dachary (OuoU) <loic@debian.org>,
            Thomas Goirand <zigo@debian.org>,
            Ghe Rivero <ghe.rivero@stackops.com>,
            Mehdi Abaakouk <sileht@sileht.net>
-Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools,
+Build-Depends: debhelper (>= 9),
+ python-all (>= 2.6.6-3~),
+ python-setuptools
+Build-Depends-Indep: openstack-pkg-tools,
  pep8,
  python-cloudfiles,
  python-coverage,

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 099ecc114844bc60c866dc9a884ac86ce2c99491..a31d66a7ddf97b733c17112c881f852de033d368 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,12 +1,8 @@
 #!/usr/bin/make -f
 
-# 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)
+include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
        dh $@ --with python2
@@ -48,24 +44,9 @@ override_dh_install:
        ln -s /var/lib/openstack-dashboard/static/js $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
        ln -s /var/lib/openstack-dashboard/static/css $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
 
-override_dh_builddeb:
-       dh_builddeb -- -Zxz -z9
-
 override_dh_auto_clean:
        dh_auto_clean
        rm -rf $(CURDIR)/static
        rm -rf $(CURDIR)/horizon/build
        rm -rf $(CURDIR)/horizon.egg-info
        rm -rf $(CURDIR)/openstack_dashboard/openstack_dashboard.egg-info
-
-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