diff -Nru python-rebulk-0.9.0/debian/changelog python-rebulk-0.9.0/debian/changelog --- python-rebulk-0.9.0/debian/changelog 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/changelog 2018-08-27 11:08:35.000000000 +0000 @@ -1,5 +1,19 @@ +python-rebulk (0.9.0-2) unstable; urgency=medium + + * Team upload. + * d/control: Set Vcs-* to salsa.debian.org + * Enable autopkgtest-pkg-python testsuite + * d/p/0001-Remove-embedded-toposort.patch: + Add toposort into install_requires (Closes: #896269) + * Bump debhelper compat level to 11 + * Standards version is 4.2.1 now (no changes) + * d/copyright: Remove unused paragraph + + -- Ondřej Nový Mon, 27 Aug 2018 13:08:35 +0200 + python-rebulk (0.9.0-1) unstable; urgency=medium + [ Etienne Millon ] * Initial release. (Closes: #877103) -- Etienne Millon Thu, 28 Sep 2017 21:13:27 +0200 diff -Nru python-rebulk-0.9.0/debian/compat python-rebulk-0.9.0/debian/compat --- python-rebulk-0.9.0/debian/compat 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/compat 2018-08-27 11:03:15.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru python-rebulk-0.9.0/debian/control python-rebulk-0.9.0/debian/control --- python-rebulk-0.9.0/debian/control 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/control 2018-08-27 11:03:34.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Python Modules Team Uploaders: Etienne Millon Build-Depends: - debhelper (>= 9), + debhelper (>= 11), dh-python, python3-all, python3-pytest, @@ -12,11 +12,11 @@ python3-setuptools, python3-six, python3-toposort, -Standards-Version: 4.1.1 +Standards-Version: 4.2.1 Homepage: https://github.com/Toilal/rebulk -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-rebulk.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-rebulk.git -X-Python3-Version: >= 3.3 +Vcs-Git: https://salsa.debian.org/python-team/modules/python-rebulk.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/python-rebulk +Testsuite: autopkgtest-pkg-python Package: python3-rebulk Architecture: all diff -Nru python-rebulk-0.9.0/debian/copyright python-rebulk-0.9.0/debian/copyright --- python-rebulk-0.9.0/debian/copyright 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/copyright 2018-08-27 11:05:31.000000000 +0000 @@ -7,25 +7,6 @@ Copyright: 2015-2017 Rémi Alvergnat License: MIT -Files: rebulk/test/test_toposort.py - rebulk/toposort.py -Copyright: 2014, True Blade Systems, Inc. -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian systems, the complete text of the Apache License, - Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'. - Files: debian/* Copyright: 2017 Etienne Millon License: MIT diff -Nru python-rebulk-0.9.0/debian/.git-dpm python-rebulk-0.9.0/debian/.git-dpm --- python-rebulk-0.9.0/debian/.git-dpm 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# see git-dpm(1) from git-dpm package -d74f79ae4f614ea6b9d04ebb6bc564cb3b38cd23 -d74f79ae4f614ea6b9d04ebb6bc564cb3b38cd23 -d74f79ae4f614ea6b9d04ebb6bc564cb3b38cd23 -d74f79ae4f614ea6b9d04ebb6bc564cb3b38cd23 -python-rebulk_0.9.0.orig.tar.gz -00d2525a7e0c2d6b0e13b2b6ffaa8c5f6a921e84 -257342 diff -Nru python-rebulk-0.9.0/debian/patches/0001-Remove-embedded-toposort.patch python-rebulk-0.9.0/debian/patches/0001-Remove-embedded-toposort.patch --- python-rebulk-0.9.0/debian/patches/0001-Remove-embedded-toposort.patch 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/patches/0001-Remove-embedded-toposort.patch 2018-08-27 08:53:50.000000000 +0000 @@ -10,11 +10,9 @@ delete mode 100644 rebulk/test/test_toposort.py delete mode 100644 rebulk/toposort.py -diff --git a/rebulk/rules.py b/rebulk/rules.py -index 19b563a..55d165d 100644 --- a/rebulk/rules.py +++ b/rebulk/rules.py -@@ -11,7 +11,7 @@ from logging import getLogger +@@ -11,7 +11,7 @@ import six from .utils import is_iterable @@ -23,9 +21,6 @@ from . import debug -diff --git a/rebulk/test/test_toposort.py b/rebulk/test/test_toposort.py -deleted file mode 100644 -index 76ea603..0000000 --- a/rebulk/test/test_toposort.py +++ /dev/null @@ -1,111 +0,0 @@ @@ -140,9 +135,6 @@ - actual = toposort_flatten(data, False) - results = [set([i for i in actual[0:3]]), set([i for i in actual[3:5]]), set([i for i in actual[5:8]])] - assert results == expected -diff --git a/rebulk/toposort.py b/rebulk/toposort.py -deleted file mode 100644 -index 2bcba9a..0000000 --- a/rebulk/toposort.py +++ /dev/null @@ -1,84 +0,0 @@ @@ -230,3 +222,14 @@ - for d in toposort(data): - result.extend((sorted if sort else list)(d)) - return result +--- a/setup.py ++++ b/setup.py +@@ -9,7 +9,7 @@ + with io.open('README.rst', 'r', encoding='utf-8') as f: + readme = f.read() + +-install_requires = ['six'] ++install_requires = ['six', 'toposort'] + if sys.version_info < (2, 7): + install_requires.extend(['ordereddict']) + diff -Nru python-rebulk-0.9.0/debian/tests/control python-rebulk-0.9.0/debian/tests/control --- python-rebulk-0.9.0/debian/tests/control 2017-09-28 19:13:27.000000000 +0000 +++ python-rebulk-0.9.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -m pytest --pyargs rebulk.test; done -Depends: python3-all, python3-rebulk, python3-pytest diff -Nru python-rebulk-0.9.0/debian/tests/control.autodep8 python-rebulk-0.9.0/debian/tests/control.autodep8 --- python-rebulk-0.9.0/debian/tests/control.autodep8 1970-01-01 00:00:00.000000000 +0000 +++ python-rebulk-0.9.0/debian/tests/control.autodep8 2018-08-27 08:47:00.000000000 +0000 @@ -0,0 +1,2 @@ +Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$AUTOPKGTEST_TMP" ; echo "Testing with $py:" ; $py -m pytest --pyargs rebulk.test; done +Depends: python3-all, python3-rebulk, python3-pytest