diff -Nru python-xstatic-rickshaw-1.5.0.2/debian/changelog python-xstatic-rickshaw-1.5.0.2/debian/changelog --- python-xstatic-rickshaw-1.5.0.2/debian/changelog 2014-09-10 14:59:22.000000000 +0000 +++ python-xstatic-rickshaw-1.5.0.2/debian/changelog 2018-04-02 13:39:42.000000000 +0000 @@ -1,3 +1,25 @@ +python-xstatic-rickshaw (1.5.0.2-3) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + * d/rules: Changed UPSTREAM_GIT to new URL + * d/copyright: Changed source URL to new one + + [ Daniel Baumann ] + * Updating vcs fields. + * 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 ] + * Add missing dh-python build-depends. + * Standards-Version is now 4.1.3. + * Removed Python 2 support. + + -- Thomas Goirand Mon, 02 Apr 2018 15:39:42 +0200 + python-xstatic-rickshaw (1.5.0.2-2) unstable; urgency=medium * Added (c) 2005-2010 Sam Stephenson in debian/copyright as per FTP masters diff -Nru python-xstatic-rickshaw-1.5.0.2/debian/control python-xstatic-rickshaw-1.5.0.2/debian/control --- python-xstatic-rickshaw-1.5.0.2/debian/control 2014-09-10 14:59:22.000000000 +0000 +++ python-xstatic-rickshaw-1.5.0.2/debian/control 2018-04-02 13:39:42.000000000 +0000 @@ -1,71 +1,34 @@ Source: python-xstatic-rickshaw Section: python Priority: optional -Maintainer: PKG OpenStack -Uploaders: Thomas Goirand -Build-Depends: debhelper (>= 9), - python-all (>= 2.6.6-3~), - python-setuptools, - python3-all, - python3-setuptools -Build-Conflicts: python-xstatic, python3-xstatic -Standards-Version: 3.9.5 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-xstatic-rickshaw.git -Vcs-Git: git://anonscm.debian.org/openstack/python-xstatic-rickshaw.git +Maintainer: Debian OpenStack +Uploaders: + Thomas Goirand , +Build-Depends: + debhelper (>= 9), + dh-python, + openstack-pkg-tools (>= 75~), + python3-all, + python3-setuptools, +Build-Conflicts: + python3-xstatic, +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-rickshaw +Vcs-Git: https://salsa.debian.org/openstack-team/xstatic/python-xstatic-rickshaw.git Homepage: https://github.com/stackforge/xstatic-rickshaw -Package: python-xstatic-rickshaw -Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: libjs-rickshaw, python-xstatic, ${misc:Depends}, ${python:Depends} -Description: Rickshaw JS XStatic support - 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. - . - This package provides Rickshaw JS support as a Python 2.x module. - Package: python3-xstatic-rickshaw Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: libjs-rickshaw, python3-xstatic, ${misc:Depends}, ${python3:Depends} +Depends: + libjs-rickshaw, + python3-xstatic, + ${misc:Depends}, + ${python3:Depends}, Description: Rickshaw JS XStatic support - 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 provides Rickshaw JS support as a Python 3.x module. diff -Nru python-xstatic-rickshaw-1.5.0.2/debian/copyright python-xstatic-rickshaw-1.5.0.2/debian/copyright --- python-xstatic-rickshaw-1.5.0.2/debian/copyright 2014-09-10 14:59:22.000000000 +0000 +++ python-xstatic-rickshaw-1.5.0.2/debian/copyright 2018-04-02 13:39:42.000000000 +0000 @@ -1,6 +1,6 @@ -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-Rickshaw -Source: git://github.com/stackforge/xstatic-rickshaw.git +Source: https://github.com/openstack/xstatic-rickshaw.git Files: debian/* Copyright: (c) 2014, Thomas Goirand diff -Nru python-xstatic-rickshaw-1.5.0.2/debian/gbp.conf python-xstatic-rickshaw-1.5.0.2/debian/gbp.conf --- python-xstatic-rickshaw-1.5.0.2/debian/gbp.conf 2014-09-10 14:59:22.000000000 +0000 +++ python-xstatic-rickshaw-1.5.0.2/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-rickshaw-1.5.0.2/debian/rules python-xstatic-rickshaw-1.5.0.2/debian/rules --- python-xstatic-rickshaw-1.5.0.2/debian/rules 2014-09-10 14:59:22.000000000 +0000 +++ python-xstatic-rickshaw-1.5.0.2/debian/rules 2018-04-02 13:39:42.000000000 +0000 @@ -1,24 +1,19 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - -UPSTREAM_GIT = git://github.com/stackforge/xstatic-rickshaw.git --include /usr/share/openstack-pkg-tools/pkgos.make +UPSTREAM_GIT := https://github.com/openstack/xstatic-rickshaw.git +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_install: - set -e && for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-xstatic-rickshaw; \ - done - set -e && for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-xstatic-rickshaw; \ - done - rm -rf $(CURDIR)/debian/python*-xstatic-rickshaw/usr/lib/python*/dist-packages/*.pth +override_dh_auto_build: + echo "Do nothing..." + +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 rm -rf $(CURDIR)/debian/python*-xstatic-rickshaw/usr/lib/python*/dist-packages/xstatic/pkg/rickshaw/data override_dh_clean: @@ -34,4 +29,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: -