diff --git a/debian/changelog b/debian/changelog index 1cd2889..bd6b36d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-xstatic-tv4 (1.2.7.0-2) UNRELEASED; urgency=medium +python-xstatic-tv4 (1.2.7.0-2) unstable; urgency=medium [ Daniel Baumann ] * Updating copyright format url. @@ -10,7 +10,11 @@ [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org - -- Daniel Baumann Fri, 04 Aug 2017 22:32:31 +0200 + [ Thomas Goirand ] + * Removed Python 2 support. + * Standards-Version is now 4.1.3. + + -- Thomas Goirand Mon, 02 Apr 2018 16:00:14 +0200 python-xstatic-tv4 (1.2.7.0-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index d8bd75e..b42fa52 100644 --- a/debian/control +++ b/debian/control @@ -8,38 +8,16 @@ Build-Depends: debhelper (>= 9), dh-python, - openstack-pkg-tools (>= 52~), - python-all, - python-setuptools, + openstack-pkg-tools (>= 75~), python3-all, python3-setuptools, yui-compressor, Build-Conflicts: - python-xstatic, python3-xstatic, -Standards-Version: 4.1.0 +Standards-Version: 4.1.3 Vcs-Browser: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-tv4 Vcs-Git: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-tv4.git Homepage: http://geraintluff.github.com/tv4/ - -Package: python-xstatic-tv4 -Architecture: all -Depends: - libjs-jquery (>= 1.8.0), - libjs-tv4, - python-xstatic, - ${misc:Depends}, - ${python:Depends}, -Description: tv4 (XStatic packaging standard) - Python 2.7 - 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. - . - For a description of tv4, see the libjs-tv4 package. - . - This package contains the Python 2.7 module. Package: python3-xstatic-tv4 Architecture: all diff --git a/debian/rules b/debian/rules index a094415..01022b9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,19 @@ #!/usr/bin/make -f UPSTREAM_GIT := https://github.com/robcresswell/xstatic-tv4.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_install: - pkgos-dh_auto_install +override_dh_auto_clean: + echo "Do nothing..." override_dh_auto_build: yui-compressor -o xstatic/pkg/tv4/data/tv4.min.js xstatic/pkg/tv4/data/tv4.js - dh_auto_build -O--buildsystem=python_distutils + +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) @@ -22,7 +24,6 @@ dh_clean -O--buildsystem=python_distutils rm -rf build - # Commands not to run override_dh_installcatalogs: override_dh_installemacsen override_dh_installifupdown: @@ -32,4 +33,3 @@ override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: override_dh_installcron override_dh_installdebconf: override_dh_installlogrotate override_dh_installgsettings: -