diff -Nru python-xstatic-1.0.0/debian/changelog python-xstatic-1.0.0/debian/changelog --- python-xstatic-1.0.0/debian/changelog 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/changelog 2018-04-02 14:13:33.000000000 +0000 @@ -1,3 +1,31 @@ +python-xstatic (1.0.0-6) unstable; urgency=medium + + * Removed Python 2 support. + + -- Thomas Goirand Mon, 02 Apr 2018 16:13:33 +0200 + +python-xstatic (1.0.0-5) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + + [ Daniel Baumann ] + * Updating copyright format url. + * Updating maintainer field. + * Running wrap-and-sort -bast. + * Removing gbp.conf, not used anymore or should be specified in the + developers dotfiles. + + [ Thomas Goirand ] + * Removed inactive maintainers. + * Fixed long description according to Justin R Rye recommendations. + * Bumped debhelper to 10. + * Fixed (build-)depends after jessie and stretch release. + * Standards-Version is now 4.1.3. + * Add missing dh-python build-depends. + + -- Thomas Goirand Mon, 02 Apr 2018 00:01:26 +0200 + python-xstatic (1.0.0-4) unstable; urgency=medium * Fixed upstream URLs (Closes: #757796). diff -Nru python-xstatic-1.0.0/debian/compat python-xstatic-1.0.0/debian/compat --- python-xstatic-1.0.0/debian/compat 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/compat 2018-04-02 14:13:33.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru python-xstatic-1.0.0/debian/control python-xstatic-1.0.0/debian/control --- python-xstatic-1.0.0/debian/control 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/control 2018-04-02 14:13:33.000000000 +0000 @@ -1,103 +1,46 @@ Source: python-xstatic Section: python Priority: optional -Maintainer: PKG OpenStack -Uploaders: Julien Danjou , - Thomas Goirand , - Mehdi Abaakouk , - Gonéri Le Bouder -Build-Depends: debhelper (>= 9), - python-all (>= 2.6.6-3~), - python-setuptools, - python3-all, - python3-setuptools, - python-sphinx -Standards-Version: 3.9.5 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-xstatic.git -Vcs-Git: git://anonscm.debian.org/openstack/python-xstatic.git +Maintainer: Debian OpenStack +Uploaders: + Thomas Goirand , +Build-Depends: + debhelper (>= 10), + dh-python, + openstack-pkg-tools (>= 75~), + python-sphinx, + python3-all, + python3-setuptools, +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/openstack-team/xstatic/python-xstatic +Vcs-Git: https://salsa.debian.org/openstack-team/xstatic/python-xstatic.git Homepage: https://bitbucket.org/thomaswaldmann/xstatic -Package: python-xstatic +Package: python-xstatic-doc +Section: doc Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${python:Depends} -Description: XStatic base package with minimal support code - Python 2.x - XStatic is a packaging standard to package external (often 3rd party) static - files as a Python package, so they are easily usable on all operating systems, - with any package management system or even without one. - . - Many Python projects need to use some specific data files, like javascript, - css, java applets, images, etc. Sometimes these files belong to YOUR project - (then you may want to package them separately, but you could also just put - them into your main package). But in many other cases, those files are - maintained by someone else (like jQuery javascript library or even much bigger - js libraries or applications) and you definitely do not really want to merge - them into your project. So, you want to have static file packages, but you - don’t want to get lots of stuff you do not want. Thus, stuff required by - XStatic file packages (especially the main, toplevel XStatic package) tries to - obey to be a MINIMAL, no-fat thing. XStatic doesn't "sell" any web framework - or other stuff you don't want. Maybe there will be optional XStatic extensions - for all sorts of stuff, but they won't be required if you just want the files. - . - By having static files in packages, it is also easier to build virtual envs, - support linux/bsd/... distribution package maintainers and even windows - installs using the same mechanism. +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: XStatic base package with minimal support code - doc + 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. + This package contains the documentation. Package: python3-xstatic Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${python3:Depends} +Depends: + ${misc:Depends}, + ${python3:Depends}, Description: XStatic base package with minimal support code - Python 3.x - XStatic is a packaging standard to package external (often 3rd party) static - files as a Python package, so they are easily usable on all operating systems, - with any package management system or even without one. - . - Many Python projects need to use some specific data files, like javascript, - css, java applets, images, etc. Sometimes these files belong to YOUR project - (then you may want to package them separately, but you could also just put - them into your main package). But in many other cases, those files are - maintained by someone else (like jQuery javascript library or even much bigger - js libraries or applications) and you definitely do not really want to merge - them into your project. So, you want to have static file packages, but you - don’t want to get lots of stuff you do not want. Thus, stuff required by - XStatic file packages (especially the main, toplevel XStatic package) tries to - obey to be a MINIMAL, no-fat thing. XStatic doesn't "sell" any web framework - or other stuff you don't want. Maybe there will be optional XStatic extensions - for all sorts of stuff, but they won't be required if you just want the files. - . - By having static files in packages, it is also easier to build virtual envs, - support linux/bsd/... distribution package maintainers and even windows - installs using the same mechanism. + 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 3.x module. - -Package: python-xstatic-doc -Section: doc -Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${misc:Depends}, ${sphinxdoc:Depends} -Description: XStatic base package with minimal support code - doc - XStatic is a packaging standard to package external (often 3rd party) static - files as a Python package, so they are easily usable on all operating systems, - with any package management system or even without one. - . - Many Python projects need to use some specific data files, like javascript, - css, java applets, images, etc. Sometimes these files belong to YOUR project - (then you may want to package them separately, but you could also just put - them into your main package). But in many other cases, those files are - maintained by someone else (like jQuery javascript library or even much bigger - js libraries or applications) and you definitely do not really want to merge - them into your project. So, you want to have static file packages, but you - don’t want to get lots of stuff you do not want. Thus, stuff required by - XStatic file packages (especially the main, toplevel XStatic package) tries to - obey to be a MINIMAL, no-fat thing. XStatic doesn't "sell" any web framework - or other stuff you don't want. Maybe there will be optional XStatic extensions - for all sorts of stuff, but they won't be required if you just want the files. - . - By having static files in packages, it is also easier to build virtual envs, - support linux/bsd/... distribution package maintainers and even windows - installs using the same mechanism. - . - This package contains the documentation. diff -Nru python-xstatic-1.0.0/debian/copyright python-xstatic-1.0.0/debian/copyright --- python-xstatic-1.0.0/debian/copyright 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/copyright 2018-04-02 14:13:33.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: XStatic Source: https://bitbucket.org/thomaswaldmann/xstatic diff -Nru python-xstatic-1.0.0/debian/gbp.conf python-xstatic-1.0.0/debian/gbp.conf --- python-xstatic-1.0.0/debian/gbp.conf 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -[DEFAULT] -upstream-branch = master -debian-branch = debian/unstable -upstream-tag = %(version)s -compression = xz - -[git-buildpackage] -export-dir = ../build-area/ - diff -Nru python-xstatic-1.0.0/debian/rules python-xstatic-1.0.0/debian/rules --- python-xstatic-1.0.0/debian/rules 2014-09-10 11:49:08.000000000 +0000 +++ python-xstatic-1.0.0/debian/rules 2018-04-02 14:13:33.000000000 +0000 @@ -1,28 +1,23 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - UPSTREAM_GIT = https://bitbucket.org/thomaswaldmann/xstatic --include /usr/share/openstack-pkg-tools/pkgos.make +include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc + dh $@ --buildsystem=python_distutils --with python3,sphinxdoc -override_dh_install: - set -e && for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-xstatic; \ - done - set -e && for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-xstatic; \ - done - rm -f $(CURDIR)/debian/python*-xstatic/usr/lib/python*/dist-packages/XStatic-*.pth +override_dh_auto_clean: + echo "Do nothing..." + +override_dh_auto_build: + echo "Do nothing..." + +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - set -e && for pyvers in $(PYTHONS) $(PYTHON3S); do \ + set -e && for pyvers in $(PYTHON3S); do \ python$$pyvers setup.py test ; \ done endif @@ -42,4 +37,3 @@ override_dh_installmodules override_dh_installlogcheck: override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: -