[DEB] Add python-django-openstack-auth to MOS11 repository

  * Version: 3.1.1-1~u16.04+mos0
  * Sync changes with http://http.debian.net/debian/pool/main/p/python-django-openstack-auth/python-django-openstack-auth_2.4.1-2.dsc
  * Fix (build-)dependencies.

Change-Id: I45d48e3a172513dfca8a9aeafbb83eec11ee9dec

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 6586309cb670a1e7624841b953aed2c5144527fa..ad4b2e20843f054bcd3b17c4fa7fbe0693b5ad47 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,11 @@
+python-django-openstack-auth (3.1.1-1~u16.04+mos0) mos11.0; urgency=medium
+
+  * Rebuild for MOS11
+  * Sync changes with http://http.debian.net/debian/pool/main/p/python-django-openstack-auth/python-django-openstack-auth_2.4.1-2.dsc
+  * Fix (build-)dependencies.
+
+ -- Andrii Kroshchenko <akroshchenko@mirantis.com>  Tue, 21 Feb 2017 12:24:24 +0200
+
 python-django-openstack-auth (2.4.0-1~u16.04+mos0) mos10.0; urgency=medium
 
   * Fix (build-)dependencies.

diff --git a/xenial/debian/control b/xenial/debian/control
index 9eddfbd08ba3803cce95ac69fff17779e8496b04..1010dd5726e19b53d18a3cda1de1357e37675d80 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -11,12 +11,12 @@ Build-Depends: debhelper (>= 9),
                python-all,
                python-pbr (>= 1.8),
                python-setuptools,
-               python-sphinx (>= 1.2.1),
+               python-sphinx (>= 1.5.1),
                python3-all,
                python3-pbr (>= 1.8),
                python3-setuptools,
 Build-Depends-Indep: python-babel (>= 2.3.4),
-                     python-coverage (>= 3.6),
+                     python-coverage (>= 4.0),
                      python-django (>= 1.8),
                      python-hacking (>= 0.10.0),
                      python-keystoneauth1 (>= 2.10.0),
@@ -25,7 +25,7 @@ Build-Depends-Indep: python-babel (>= 2.3.4),
                      python-mox3 (>= 0.7.0),
                      python-oslo.config (>= 1:3.14.0),
                      python-oslo.policy (>= 1.9.0),
-                     python-oslosphinx (>= 2.5.0),
+                     python-oslosphinx (>= 4.7.0),
                      python-six (>= 1.9.0),
                      python-testscenarios (>= 0.4),
                      python3-babel (>= 2.3.4),
@@ -39,17 +39,17 @@ Build-Depends-Indep: python-babel (>= 2.3.4),
                      python3-six (>= 1.9.0),
                      python3-testscenarios (>= 0.4),
 Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/openstack/python-django-openstack-auth.git
-Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-django-openstack-auth.git/
+Vcs-Git: https://git.openstack.org/openstack/deb-python-django-openstack-auth -b debian/newton
+Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-python-django-openstack-auth?h=debian%2Fnewton
 Homepage: https://pypi.python.org/pypi/django_openstack_auth
 
 Package: python-django-openstack-auth
 Architecture: all
 Depends: python-django (>= 1.8),
-         python-keystoneauth1 (>= 2.10.0),
-         python-keystoneclient (>= 1:1.7.0),
+         python-keystoneauth1 (>= 2.18.0),
+         python-keystoneclient (>= 1:3.8.0),
          python-oslo.config (>= 1:3.14.0),
-         python-oslo.policy (>= 1.9.0),
+         python-oslo.policy (>= 1.17.0),
          python-pbr (>= 1.8),
          python-six (>= 1.9.0),
          ${misc:Depends},
@@ -82,10 +82,10 @@ Description: Django authentication backend for Openstack - transition package
 Package: python3-django-openstack-auth
 Architecture: all
 Depends: python3-django (>= 1.8),
-         python3-keystoneauth1 (>= 2.10.0),
-         python3-keystoneclient (>= 1:1.7.0),
+         python3-keystoneauth1 (>= 2.18.0),
+         python3-keystoneclient (>= 1:3.8.0),
          python3-oslo.config (>= 1:3.14.0),
-         python3-oslo.policy (>= 1.9.0),
+         python3-oslo.policy (>= 1.17.0),
          python3-pbr (>= 1.8),
          python3-six (>= 1.9.0),
          ${misc:Depends},

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 160f8e63f6957178be8d756814d8a9a06ffbf4bd..18279f9fce96b27fe6d8d0d02331d8657eee92fe 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,29 +1,17 @@
 #!/usr/bin/make -f
 
-PYTHONS:=$(shell pyversions -vr)
-PYTHON3S:=$(shell py3versions -vr)
-
 UPSTREAM_GIT := https://github.com/openstack/django_openstack_auth.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
        dh $@  --with python2,python3
 
 override_dh_auto_install:
-       set -e ; for pyvers in $(PYTHONS); do \
-               python$$pyvers setup.py install --install-layout=deb \
-                       --root $(CURDIR)/debian/python-django-openstack-auth; \
-       done
-       set -e ; for pyvers in $(PYTHON3S); do \
-               python$$pyvers setup.py install --install-layout=deb \
-                       --root $(CURDIR)/debian/python3-django-openstack-auth; \
-       done
+       pkgos-dh_auto_install
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-       set -e ; for pyversion in 2.7 ; do \
+       set -e ; for pyversion in 2.7 $(PYTHON3S) ; do \
                NOSE_WITH_OPENSTACK=1 \
                NOSE_OPENSTACK_COLOR=1 \
                NOSE_OPENSTACK_RED=0.05 \

diff --git a/xenial/debian/source/options b/xenial/debian/source/options
index cb61fa5267b6ad8b3bbc2a612754b79dae466292..912224515e06f63403e6e177a39145c46c89344b 100644 (file)
--- a/xenial/debian/source/options
+++ b/xenial/debian/source/options
@@ -1 +1,2 @@
 extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^[.]gitreview$"