diff -Nru scoop-0.7.1/debian/changelog scoop-0.7.1/debian/changelog --- scoop-0.7.1/debian/changelog 2014-09-09 04:26:47.000000000 +0000 +++ scoop-0.7.1/debian/changelog 2015-04-27 07:34:44.000000000 +0000 @@ -1,3 +1,21 @@ +scoop (0.7.1-3) unstable; urgency=medium + + * Upload to unstable. + * deb/copyright: expanded copyright span. + * deb/control: updated Homepage. + * deb/watch: watch pypi.debian.net. + * Added deb/gbp.conf, no-updated-timestamp-in-docs.patch (Closes: #782258). + + -- Daniel Stender Mon, 27 Apr 2015 09:33:30 +0200 + +scoop (0.7.1-2) experimental; urgency=medium + + * Added Python3 package to build and auto testing (Closes: #766970). + * deb/control: bumped standards to 3.9.6 (no changes needed). + * deb/copyright: added maintainer email addresses. + + -- Daniel Stender Sat, 01 Nov 2014 19:59:15 +0100 + scoop (0.7.1-1) unstable; urgency=medium * Initial release (Closes: #760188, LP: #1283817): diff -Nru scoop-0.7.1/debian/control scoop-0.7.1/debian/control --- scoop-0.7.1/debian/control 2014-09-09 05:07:07.000000000 +0000 +++ scoop-0.7.1/debian/control 2015-04-27 07:34:44.000000000 +0000 @@ -1,33 +1,43 @@ Source: scoop Maintainer: Debian Science Maintainers -Uploaders: Daniel Stender +Uploaders: + Daniel Stender Section: science -Testsuite: autopkgtest Priority: optional -Build-Depends: debhelper (>= 9), - dh-python, - dvipng, - python-all (>= 2.6.6.3~), - python-greenlet (>= 0.3.4~), - python-setuptools, - python-sphinx (>= 1.0.7+dfsg-1~), - python-zmq (>= 13.1.0~), - texlive-latex-extra -Standards-Version: 3.9.5 +Build-Depends: + debhelper (>= 9), + dh-python, + dvipng, + python-all (>= 2.6.6.3~), + python-greenlet (>= 0.3.4~), + python-setuptools, + python-sphinx (>= 1.0.7+dfsg-1~), + python-zmq (>= 13.1.0~), + python3-all, + python3-greenlet, + python3-setuptools, + python3-zmq (>= 13.1.0~), + texlive-latex-extra +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/scoop.git Vcs-Git: git://anonscm.debian.org/debian-science/packages/scoop.git -Homepage: http://scoop.googlecode.com/ +Homepage: http://pyscoop.org/ X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.2 +XS-Testsuite: autopkgtest Package: python-scoop Architecture: all Section: python -Depends: python-greenlet (>= 0.3.4~), - python-zmq (>= 13.1.0~), - ${misc:Depends}, - ${python:Depends} -Recommends: openssh-client | ssh-client -Suggests: scoop-doc +Depends: + python-greenlet (>= 0.3.4~), + python-zmq (>= 13.1.0~), + ${misc:Depends}, + ${python:Depends} +Recommends: + openssh-client | ssh-client +Suggests: + scoop-doc Description: Python library for concurrent parallel programming SCOOP (Scalable COncurrent Operations in Python) is a distributed task module allowing concurrent parallel programming on various environments, @@ -35,12 +45,34 @@ . This package contains the Python modules. +Package: python3-scoop +Architecture: all +Section: python +Depends: + python3-greenlet (>= 0.3.4~), + python3-zmq (>= 13.1.0~), + ${misc:Depends}, + ${python3:Depends} +Recommends: + openssh-client | ssh-client +Suggests: + scoop-doc +Description: Python3 library for concurrent parallel programming + SCOOP (Scalable COncurrent Operations in Python) is a distributed task + module allowing concurrent parallel programming on various environments, + from heterogeneous grids to supercomputers. + . + This package contains the Python3 modules. + Package: scoop-doc Architecture: all Section: doc -Depends: ${misc:Depends}, - ${sphinxdoc:Depends} -Recommends: python-scoop +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends} +Recommends: + python-scoop, + python3-scoop Description: Python library for concurrent parallel programming (docs) SCOOP (Scalable COncurrent Operations in Python) is a distributed task module allowing concurrent parallel programming on various environments, diff -Nru scoop-0.7.1/debian/copyright scoop-0.7.1/debian/copyright --- scoop-0.7.1/debian/copyright 2014-09-08 19:27:15.000000000 +0000 +++ scoop-0.7.1/debian/copyright 2015-04-27 07:34:44.000000000 +0000 @@ -4,14 +4,14 @@ Source: http://code.google.com/p/scoop/ Files: * -Copyright: 2012-2014 Yannik Hold-Geoffroy - Oliver Gagnon - Marc Parizeau +Copyright: 2012-2014 Yannik Hold-Geoffroy + Oliver Gagnon + Marc Parizeau License: LGPL-3.0+ Files: debian/* -Copyright: 2014 F.-E. Picca - Daniel Stender +Copyright: 2014 F.-E. Picca + 2014-2015 Daniel Stender License: LGPL-3.0+ Files: scoop/backports/dictconfig.py diff -Nru scoop-0.7.1/debian/gbp.conf scoop-0.7.1/debian/gbp.conf --- scoop-0.7.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ scoop-0.7.1/debian/gbp.conf 2015-04-27 07:34:44.000000000 +0000 @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True + +[git-import-orig] +upstream-branch = upstream +debian-branch = master diff -Nru scoop-0.7.1/debian/patches/no-updated-timestamp-in-docs.patch scoop-0.7.1/debian/patches/no-updated-timestamp-in-docs.patch --- scoop-0.7.1/debian/patches/no-updated-timestamp-in-docs.patch 1970-01-01 00:00:00.000000000 +0000 +++ scoop-0.7.1/debian/patches/no-updated-timestamp-in-docs.patch 2015-04-27 07:34:44.000000000 +0000 @@ -0,0 +1,18 @@ +Description: clear last-updated timestamp in Sphinx config + for reproducible building +Author: Daniel Stender +Bug: https://bugs.debian.org/782258 +Forwarded: not-needed +Last-Update: 2015-04-12 + +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -153,7 +153,7 @@ + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. +-html_last_updated_fmt = '%b %d, %Y' ++# html_last_updated_fmt = '%b %d, %Y' + + # If true, SmartyPants will be used to convert quotes and dashes to + # typographically correct entities. diff -Nru scoop-0.7.1/debian/patches/series scoop-0.7.1/debian/patches/series --- scoop-0.7.1/debian/patches/series 2014-09-03 18:22:24.000000000 +0000 +++ scoop-0.7.1/debian/patches/series 2015-04-27 07:34:44.000000000 +0000 @@ -1,2 +1,3 @@ +no-updated-timestamp-in-docs.patch restore-testsuite.patch no-adsense.patch diff -Nru scoop-0.7.1/debian/rules scoop-0.7.1/debian/rules --- scoop-0.7.1/debian/rules 2014-09-09 05:07:07.000000000 +0000 +++ scoop-0.7.1/debian/rules 2015-04-27 07:34:44.000000000 +0000 @@ -5,7 +5,7 @@ export PYBUILD_NAME=scoop %: - dh $@ --with python2,sphinxdoc --buildsystem=pybuild + dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild override_dh_auto_test: PYBUILD_SYSTEM=custom \ diff -Nru scoop-0.7.1/debian/tests/control scoop-0.7.1/debian/tests/control --- scoop-0.7.1/debian/tests/control 2014-09-08 19:27:15.000000000 +0000 +++ scoop-0.7.1/debian/tests/control 2015-04-27 07:34:44.000000000 +0000 @@ -1,2 +1,5 @@ Tests: python2 -Depends: python-all, python-scoop, python-greenlet, python-zmq \ No newline at end of file +Depends: python-all, python-scoop, python-greenlet, python-zmq + +Tests: python3 +Depends: python3-all, python3-scoop, python3-greenlet, python3-zmq \ No newline at end of file diff -Nru scoop-0.7.1/debian/tests/python3 scoop-0.7.1/debian/tests/python3 --- scoop-0.7.1/debian/tests/python3 1970-01-01 00:00:00.000000000 +0000 +++ scoop-0.7.1/debian/tests/python3 2015-04-27 07:34:44.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e -u +export PYTHONWARNINGS=d +cp -a test/ "$ADTTMP" +cd "$ADTTMP/test/" +py3versions -i | tr ' ' '\n' | xargs -I {} env {} tests.py 2>&1 diff -Nru scoop-0.7.1/debian/watch scoop-0.7.1/debian/watch --- scoop-0.7.1/debian/watch 2014-09-03 18:22:24.000000000 +0000 +++ scoop-0.7.1/debian/watch 2015-04-27 07:34:44.000000000 +0000 @@ -1,3 +1,4 @@ version=3 opts=uversionmangle=s/\.release/$1/ \ -https://pypi.python.org/packages/source/s/scoop/scoop-(.*)\.(?:tar\.gz|zip|tar\.bz2) \ No newline at end of file +http://pypi.debian.net/scoop/ \ +scoop-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))