diff -Nru pysha3-1.0.2/debian/changelog pysha3-1.0.2/debian/changelog --- pysha3-1.0.2/debian/changelog 2020-02-18 09:22:16.000000000 +0000 +++ pysha3-1.0.2/debian/changelog 2020-01-19 09:43:49.000000000 +0000 @@ -1,39 +1,40 @@ -pysha3 (1.0.2-2ubuntu6) focal; urgency=medium +pysha3 (1.0.2-4) unstable; urgency=medium - * No-change rebuild to drop python3.7. + * Declare Debhelper compatibility using ‘debhelper-compat’ dependency. + * Remove obsolete dependency on ‘python-setuptools’. + Closes: bug#937534. Thanks to Sandro Tosi for the follow-up notice. + * Specify the package build system does not require root privilege. + + -- Ben Finney Sun, 19 Jan 2020 20:43:49 +1100 + +pysha3 (1.0.2-3) unstable; urgency=medium + + [ Ben Finney ] + + * Upload to “unstable”. + * Declare conformance to “Standards-Version: 4.4.1”. + * Specify VCS URLs for current Debian package VCS hosting. + * Specify HTTPS URL for copyright format. + * Grant license in Debian package under condition of GPL-3+. + * Separate architecture-dependent build dependencies to + “Build-Depends-Arch”. + * Use a null command for ‘clean’ during ‘Git-BuildPackage’. + * Declare Debhelper compatibility level 12. + * debian/compat: + * Remove obsolescent configuration file. + * Record upstream metadata in DEP-12 document. + * Remove obsolete control field for Python 2 version. + * Remove declaration for minimum Python 3 version. + Python >= 3.4 is now in all supported Debian releases. + * Remove ‘get-orig-source’ and ‘get-packaged-orig-source’ targets. + These are no longer mentioned in Debian Policy 4.1.4 and later. - -- Matthias Klose Tue, 18 Feb 2020 10:22:16 +0100 + [ Sandro Tosi ] -pysha3 (1.0.2-2ubuntu5) focal; urgency=medium + * Remove support for Python 2. + Closes: bug#937534. - * No-change rebuild to build with python3.8. - - -- Matthias Klose Fri, 18 Oct 2019 18:09:59 +0000 - -pysha3 (1.0.2-2ubuntu4) disco; urgency=medium - - * No-change rebuild to build without python3.6 support. - - -- Matthias Klose Sat, 03 Nov 2018 19:41:42 +0000 - -pysha3 (1.0.2-2ubuntu3) cosmic; urgency=medium - - * No-change rebuild to build for python3.7. - - -- Matthias Klose Thu, 28 Jun 2018 06:54:27 +0000 - -pysha3 (1.0.2-2ubuntu2) bionic; urgency=medium - - * Add breaks/replaces for smooth upgrades. - - -- Dimitri John Ledkov Tue, 20 Feb 2018 10:47:34 +0000 - -pysha3 (1.0.2-2ubuntu1) bionic; urgency=medium - - * Add dummy transitional packages for Ubuntu-only names of the package. - * Can be dropped post-bionic. - - -- Dimitri John Ledkov Mon, 19 Feb 2018 16:12:08 +0000 + -- Ben Finney Fri, 25 Oct 2019 22:48:30 +1100 pysha3 (1.0.2-2) unstable; urgency=medium diff -Nru pysha3-1.0.2/debian/compat pysha3-1.0.2/debian/compat --- pysha3-1.0.2/debian/compat 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru pysha3-1.0.2/debian/control pysha3-1.0.2/debian/control --- pysha3-1.0.2/debian/control 2018-02-20 10:47:21.000000000 +0000 +++ pysha3-1.0.2/debian/control 2020-01-19 09:43:49.000000000 +0000 @@ -1,30 +1,24 @@ Source: pysha3 -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ben Finney +Maintainer: Ben Finney Section: python Priority: optional -Standards-Version: 4.0.1 Build-Depends: tox, python3-flake8, python3-setuptools, - python3-all-dev, - python3, - python-setuptools, - python-all-dev (>= 2.7~), - python (>= 2.7~), dh-python, - debhelper (>= 10~) + debhelper-compat (= 12) +Build-Depends-Arch: + python3-all-dev, + python3 +Standards-Version: 4.4.1 Homepage: https://pypi.org/project/pysha3/ -VCS-Git: https://anonscm.debian.org/git/users/bignose/debian/pkg-pysha3.git -VCS-Browser: https://anonscm.debian.org/git/users/bignose/debian/pkg-pysha3.git -X-Python-Version: >= 2.7 -X-Python3-Version: >= 3.4 +VCS-Git: https://salsa.debian.org/bignose/pkg-pysha3.git +VCS-Browser: https://salsa.debian.org/bignose/pkg-pysha3/ +Rules-Requires-Root: no Package: python3-sha3 Architecture: any -Breaks: python3-pysha3 (<< 1.0.2-2ubuntu1) -Replaces: python3-pysha3 (<< 1.0.2-2ubuntu1) Depends: ${python3:Depends}, ${shlibs:Depends}, @@ -40,35 +34,3 @@ Hash And Extendable-Output Functions”. . This package installs the library for Python 3. - -Package: python-sha3 -Architecture: any -Breaks: python-pysha3 (<< 1.0.2-2ubuntu1) -Replaces: python-pysha3 (<< 1.0.2-2ubuntu1) -Depends: - ${python:Depends}, - ${shlibs:Depends}, - ${misc:Depends} -Description: SHA-3 (Keccak) hash implementation — Python 2 - ‘sha3’ is a Python library for the SHA-3 hashing functions. - . - This is a stand-alone package of the ‘sha3’ code included in Python - 3.6 and later. - . - SHA-3, also known as “Keccak”, is a family of algorithms standardised - by NIST under the title “FIPS 202, SHA-3 Standard: Permutation-Based - Hash And Extendable-Output Functions”. - . - This package installs the library for Python 2. - -Package: python-pysha3 -Architecture: any -Depends: python-sha3 -Description: dummy transitional package for python-sha3 - This package can be safely removed. - -Package: python3-pysha3 -Architecture: any -Depends: python3-sha3 -Description: dummy transitional package for python3-sha3 - This package can be safely removed. diff -Nru pysha3-1.0.2/debian/copyright pysha3-1.0.2/debian/copyright --- pysha3-1.0.2/debian/copyright 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/copyright 2020-01-19 09:43:49.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: pysha3 Upstream-Contact: Christian Heimes Source: https://pypi.org/project/pysha3/ @@ -52,12 +52,12 @@ Files: debian/* Copyright: - © 2009–2017 Ben Finney + © 2009–2019 Ben Finney License: GPL-3+ License-Grant: - This is free software; you may copy, modify and/or distribute this work - under the terms of the GNU General Public License, version 3 or later. - No warranty expressed or implied. + This is free software: you may copy, modify, and/or distribute this work + under the terms of the GNU General Public License as published by the + Free Software Foundation; version 3 of that license or any later version. License: PSF-2 diff -Nru pysha3-1.0.2/debian/gbp.conf pysha3-1.0.2/debian/gbp.conf --- pysha3-1.0.2/debian/gbp.conf 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/gbp.conf 2020-01-19 09:43:49.000000000 +0000 @@ -1,6 +1,6 @@ # debian/gbp.conf -# Git-buildpackage configuration for this Debian source package. -# Manpage: ‘gbp.conf(5)’. +# Git-Buildpackage configuration for this Debian source package. +# Manual page: ‘gbp.conf(5)’. [DEFAULT] @@ -13,9 +13,13 @@ # Create the upstream source from this VCS repository? create-orig = false +# Command to run for invoking package clean. +# This null command works around bug#802284 in Git-BuildPackage. +cleaner = /bin/true + # Local variables: # coding: utf-8 # mode: conf # End: -# vim: fileencoding=utf-8 filetype=conf noexpandtabs : +# vim: fileencoding=utf-8 filetype=conf noexpandtab : diff -Nru pysha3-1.0.2/debian/rules pysha3-1.0.2/debian/rules --- pysha3-1.0.2/debian/rules 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/rules 2020-01-19 09:43:49.000000000 +0000 @@ -3,10 +3,9 @@ # debian/rules # Part of Debian ‘pysha3’ package. # -# Copyright © 2009–2017 Ben Finney -# This is free software; you may copy, modify and/or distribute this work -# under the terms of the GNU General Public License, version 3 or later. -# No warranty expressed or implied. +# This is free software, and you are welcome to redistribute it under +# certain conditions; see the end of this file for copyright +# information, grant of license, and disclaimer of warranty. # Send HTTP traffic to the “discard” service during packaging actions. export http_proxy = http://127.0.1.1:9/ @@ -18,35 +17,7 @@ %: - dh $@ --with python3,python2 --buildsystem=pybuild - - -.PHONY: get-packaged-orig-source -get-packaged-orig-source: - $(uscan-download-source) --download-current-version - -# Policy §4.9 strongly recommends the ‘get-orig-source’ target: -# “This target is optional, but providing it if possible is a good idea.” -# -# This target is an anomaly: per Policy §4.9, it fetches the *latest* -# upstream source, regardless of this package's version. To fetch the -# upstream source corresponding to this package's *declared* version -# in ‘debian/changelog’, use ‘get-packaged-orig-source’ instead. -.PHONY: get-orig-source -get-orig-source: - $(uscan-download-source) - -get-orig-source get-packaged-orig-source: http_proxy = -get-orig-source get-packaged-orig-source: makefile_dir = $(abspath $(dir $(firstword ${MAKEFILE_LIST}))) -get-orig-source get-packaged-orig-source: package_dir = $(abspath $(dir ${makefile_dir})) - -define uscan-download-source - uscan --noconf --verbose \ - --force-download \ - --rename \ - --destdir=$(CURDIR) \ - --check-dirname-level=0 ${package_dir} -endef # uscan-download-source + dh $@ --with python3 --buildsystem=pybuild .PHONY: override_dh_installchangelogs @@ -54,6 +25,14 @@ dh_installchangelogs CHANGES.txt +# Copyright © 2009–2019 Ben Finney +# +# This is free software: you may copy, modify, and/or distribute this work +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 3 of that license or any later version. +# No warranty expressed or implied. + + # Local variables: # mode: makefile # coding: utf-8 diff -Nru pysha3-1.0.2/debian/tests/control pysha3-1.0.2/debian/tests/control --- pysha3-1.0.2/debian/tests/control 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/tests/control 2020-01-19 09:43:49.000000000 +0000 @@ -2,11 +2,6 @@ # Control file for Debian ‘autopkgtests’. # Documentation: ‘/usr/share/doc/autopkgtest/README.package-tests.rst.gz’. -Tests: smoke-python2 -Depends: - python-pkg-resources, - python-sha3 - Tests: smoke-python3 Depends: python3-pkg-resources, diff -Nru pysha3-1.0.2/debian/tests/smoke-python2 pysha3-1.0.2/debian/tests/smoke-python2 --- pysha3-1.0.2/debian/tests/smoke-python2 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/tests/smoke-python2 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#! /bin/bash -# -# debian/tests/smoke-python2 -# Part of Debian ‘pysha3’ package. -# -# Copyright © 2016–2017 Ben Finney -# This is free software; you may copy, modify and/or distribute this work -# under the terms of the GNU General Public License, version 3 or later. -# No warranty expressed or implied. -# -# Smoke test for package in Python 2 environments. - -set -o errexit -set -o errtrace -set -o nounset - -DISTRIBUTION_NAME=pysha3 -MODULE_NAMES=( - sha3 - ) - -test_opts="--distribution=$DISTRIBUTION_NAME" -for mod in ${MODULE_NAMES[@]} ; do - # Accumulate the module names. - test_opts="$test_opts --module=$mod" -done - -for py in $(pyversions -i) ; do - printf "Python command: %s\n" $py - $py debian/tests/smoke_test.py $test_opts - printf "\n" -done - - -# Local variables: -# coding: utf-8 -# mode: shell-script -# End: -# vim: fileencoding=utf-8 filetype=sh : diff -Nru pysha3-1.0.2/debian/tests/smoke-python3 pysha3-1.0.2/debian/tests/smoke-python3 --- pysha3-1.0.2/debian/tests/smoke-python3 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/tests/smoke-python3 2020-01-19 09:43:49.000000000 +0000 @@ -3,10 +3,9 @@ # debian/tests/smoke-python3 # Part of Debian ‘pysha3’ package. # -# Copyright © 2016–2017 Ben Finney -# This is free software; you may copy, modify and/or distribute this work -# under the terms of the GNU General Public License, version 3 or later. -# No warranty expressed or implied. +# This is free software, and you are welcome to redistribute it under +# certain conditions; see the end of this file for copyright +# information, grant of license, and disclaimer of warranty. # # Smoke test for package in Python 3 environments. @@ -32,6 +31,14 @@ done +# Copyright © 2016–2019 Ben Finney +# +# This is free software: you may copy, modify, and/or distribute this work +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 3 of that license or any later version. +# No warranty expressed or implied. + + # Local variables: # coding: utf-8 # mode: shell-script diff -Nru pysha3-1.0.2/debian/tests/smoke_test.py pysha3-1.0.2/debian/tests/smoke_test.py --- pysha3-1.0.2/debian/tests/smoke_test.py 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/tests/smoke_test.py 2020-01-19 09:43:49.000000000 +0000 @@ -2,10 +2,9 @@ # # debian/tests/smoke_test.py # -# Copyright © 2016–2017 Ben Finney -# This is free software; you may copy, modify and/or distribute this work -# under the terms of the GNU General Public License, version 3 or later. -# No warranty expressed or implied. +# This is free software, and you are welcome to redistribute it under +# certain conditions; see the end of this file for copyright +# information, grant of license, and disclaimer of warranty. """ Post-install Python smoke test for use in Debian autopkgtest. @@ -17,7 +16,6 @@ Smoke test one or more modules:: --module=MODULE_FOO --module=MODULE_BAR --module=MODULE_BAZ - """ import argparse @@ -31,7 +29,6 @@ """ Emit the details of the current Python implementation. :return: ``None``. - """ sys.stdout.write( "Interpreter: {command}\n{version}\n".format( @@ -43,7 +40,6 @@ :param name: Name of the distribution to retrieve. :return: ``None``. - """ distribution = pkg_resources.get_distribution(name) sys.stdout.write( @@ -56,7 +52,6 @@ :param name: Full name of the module to import. :return: ``None``. - """ module = importlib.import_module(name) sys.stdout.write( @@ -69,7 +64,6 @@ :param args: Namespace of arguments parsed from `ArgumentParser`. :return: ``None``. - """ emit_implementation() @@ -104,7 +98,6 @@ :param argv: Sequence of all command line arguments. (Default: `sys.argv`) :return: The exit status (integer) for exit from the process. - """ exit_status = 0 @@ -129,6 +122,14 @@ sys.exit(exit_status) +# Copyright © 2016–2019 Ben Finney +# +# This is free software: you may copy, modify, and/or distribute this work +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; version 3 of that license or any later version. +# No warranty expressed or implied. + + # Local variables: # coding: utf-8 # mode: python diff -Nru pysha3-1.0.2/debian/upstream/metadata pysha3-1.0.2/debian/upstream/metadata --- pysha3-1.0.2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ pysha3-1.0.2/debian/upstream/metadata 2020-01-19 09:43:49.000000000 +0000 @@ -0,0 +1,33 @@ +# debian/upstream/metadata +# Part of Debian ‘pysha3’ package. +# +# This is free software, and you are welcome to redistribute it under +# certain conditions; see the end of this file for copyright +# information, grant of license, and disclaimer of warranty. + +%YAML 1.1 +--- +# +Name: pysha3 +Homepage: https://github.com/tiran/pysha3 +Contact: Christian Heimes +Archive: PyPI +Bug-Database: https://github.com/tiran/pysha3/issues/ +Bug-Submit: https://github.com/tiran/pysha3/issues/new +Repository: https://github.com/tiran/pysha3.git +Repository-Browse: https://github.com/tiran/pysha3/ +Changelog: https://github.com/tiran/pysha3/blob/master/CHANGES.txt + + +# Copyright © 2018–2019 Ben Finney +# +# This is free software; you may copy, modify, and/or distribute this work +# under the terms of the GNU General Public License, version 3 or later. +# No warranty expressed or implied. +# See the file '/usr/share/common-licenses/GPL-3' for details. + +# Local variables: +# coding: utf-8 +# mode: yaml +# End: +# vim: fileencoding=utf-8 filetype=yaml : diff -Nru pysha3-1.0.2/debian/watch pysha3-1.0.2/debian/watch --- pysha3-1.0.2/debian/watch 2017-08-22 23:36:06.000000000 +0000 +++ pysha3-1.0.2/debian/watch 2020-01-19 09:43:49.000000000 +0000 @@ -5,9 +5,9 @@ # Version of UScan configuration format. version = 4 -# Current version from Python Package Index. +# Source tarball from Python Package Index. opts = "uversionmangle=s/(\d)((?:a|b|c|rc)\d*)$/$1~$2/" \ - http://pypi.debian.net/@PACKAGE@/ \ + https://pypi.debian.net/@PACKAGE@/ \ /@PACKAGE@/@PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@ \ debian uupdate