diff --git a/debian/changelog b/debian/changelog index 4f74f7941331897ce19f36985ebdaaa2fc552eb5..eea09870235872d19d5cda4638a7065747abb709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-xstatic-jquery.bootstrap.wizard (1.0.0.1-2.1) UNRELEASED; urgency=medium +python-xstatic-jquery.bootstrap.wizard (1.0.0.1-2) unstable; urgency=medium [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org @@ -14,6 +14,7 @@ python-xstatic-jquery.bootstrap.wizard (1.0.0.1-2.1) UNRELEASED; urgency=medium [ Thomas Goirand ] * Add missing dh-python build-depends. + * Removed Python 2 support. -- Thomas Goirand Mon, 02 Apr 2018 14:57:30 +0200 diff --git a/debian/compat b/debian/compat index ec635144f60048986bc560c5576355344005e6e7..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 171b8a031e3b023cc9d51b30e385cbb43a9e35ed..6c4ff1c8195407c8a2db585c53a7e568381ea7a3 100644 --- a/debian/control +++ b/debian/control @@ -5,44 +5,20 @@ Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper (>= 9), + debhelper (>= 10), dh-python, - python-all (>= 2.6.6-3~), - python-setuptools, + openstack-pkg-tools (>= 75~), python3-all, python3-setuptools, Build-Conflicts: - python-xstatis, python3-xstatic, Standards-Version: 4.1.0 Vcs-Browser: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-jquery.bootstrap.wizard Vcs-Git: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-jquery.bootstrap.wizard.git Homepage: https://github.com/stackforge/XStatic-JQuery.Bootstrap.Wizard -Package: python-xstatic-jquery.bootstrap.wizard -Architecture: all -Pre-Depends: - dpkg (>= 1.15.6~), -Depends: - libjs-twitter-bootstrap-wizard, - python-xstatic, - ${misc:Depends}, - ${python:Depends}, -Description: JQuery.Bootstrap.Wizard XStatic support - Python 2.x - XStatic is a Python web development tool for handling required static data - files from external projects, such as CSS, images, and JavaScript. It provides - a lightweight infrastructure to manage them via Python modules that your app - can depend on in a portable, virtualenv-friendly way instead of using embedded - copies. - . - This package contains the Python 2.x module XStatic support for - JQuery.Bootstrap.Wizard See the libjs-twitter-bootstrap-wizard package for - more information. - Package: python3-xstatic-jquery.bootstrap.wizard Architecture: all -Pre-Depends: - dpkg (>= 1.15.6~), Depends: libjs-twitter-bootstrap-wizard, python3-xstatic, diff --git a/debian/rules b/debian/rules index 065f7cae81a1ed33ab6dcc7f57b1713058f47377..90137e2fd74bf26c0a408cecfbec0b07ac15f120 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,20 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - UPSTREAM_GIT := https://github.com/openstack/XStatic-JQuery.Bootstrap.Wizard.git --include /usr/share/openstack-pkg-tools/pkgos.make +include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python2,python3 + dh $@ --buildsystem=python_distutils --with python3 + +override_dh_auto_clean: + echo "Do nothing..." + +override_dh_auto_build: + echo "Do nothing..." -override_dh_install: - set -e && for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-xstatic-jquery.bootstrap.wizard; \ - done - set -e && for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-xstatic-jquery.bootstrap.wizard; \ - done - rm -rf $(CURDIR)/debian/python*-xstatic-jquery.bootstrap.wizard/usr/lib/python*/dist-packages/xstatic/pkg/jquery_bootstrap_wizard/data - rm -rf $(CURDIR)/debian/python*-xstatic-jquery.bootstrap.wizard/usr/lib/python*/dist-packages/*.pth +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 + rm -rf $(CURDIR)/debian/python3-xstatic-jquery.bootstrap.wizard/usr/lib/python3/dist-packages/xstatic/pkg/jquery_bootstrap_wizard/data override_dh_clean: dh_clean -O--buildsystem=python_distutils