diff -Nru pyfiglet-0.7.4+dfsg/debian/changelog pyfiglet-0.7.4+dfsg/debian/changelog --- pyfiglet-0.7.4+dfsg/debian/changelog 2015-07-04 05:12:24.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/changelog 2018-08-27 10:55:20.000000000 +0000 @@ -1,3 +1,22 @@ +pyfiglet (0.7.4+dfsg-3) unstable; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URL (https) + * d/control: Set Vcs-* to salsa.debian.org + * d/copyright: Use https protocol in Format field + * d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP + * d/control: Remove ancient X-Python-Version field + * d/control: Remove ancient X-Python3-Version field + * Convert git repository from git-dpm to gbp layout + + [ Stefano Rivera ] + * Bump debhelper compat to 11. + * Bump Standards-Version to 4.2.1, no changes needed. + * Bump copyright years. + * Declare Rules-Requires-Root: no. + + -- Stefano Rivera Mon, 27 Aug 2018 11:55:20 +0100 + pyfiglet (0.7.4+dfsg-2) unstable; urgency=medium * Patch py3k: Don't attempt to decode command line args in py3k. diff -Nru pyfiglet-0.7.4+dfsg/debian/compat pyfiglet-0.7.4+dfsg/debian/compat --- pyfiglet-0.7.4+dfsg/debian/compat 2013-05-26 14:19:06.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/compat 2018-08-27 10:55:20.000000000 +0000 @@ -1 +1 @@ -8 +11 diff -Nru pyfiglet-0.7.4+dfsg/debian/control pyfiglet-0.7.4+dfsg/debian/control --- pyfiglet-0.7.4+dfsg/debian/control 2015-07-04 04:25:29.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/control 2018-08-27 10:55:20.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Python Modules Team Uploaders: Stefano Rivera Build-Depends: - debhelper (>= 8.1), + debhelper (>= 11), dh-python, figlet, python-all (>= 2.6), @@ -12,12 +12,11 @@ python3-all, python3-setuptools, toilet -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.1 -Standards-Version: 3.9.6 +Standards-Version: 4.2.1 Homepage: https://github.com/pwaller/pyfiglet -Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyfiglet/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyfiglet/trunk/ +Vcs-Git: https://salsa.debian.org/python-team/modules/pyfiglet.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/pyfiglet +Rules-Requires-Root: no Package: python-pyfiglet Architecture: all diff -Nru pyfiglet-0.7.4+dfsg/debian/copyright pyfiglet-0.7.4+dfsg/debian/copyright --- pyfiglet-0.7.4+dfsg/debian/copyright 2015-07-04 04:32:11.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/copyright 2018-08-27 10:55:20.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: pyfiglet Upstream-Contact: Peter Waller Source: https://github.com/pwaller/pyfiglet @@ -24,7 +24,7 @@ License: GPL-2+ Files: debian/* -Copyright: 2010-2015, Stefano Rivera +Copyright: 2010-2018, Stefano Rivera License: GPL-2+ License: GPL-2+ diff -Nru pyfiglet-0.7.4+dfsg/debian/patches/bad-toilet-fonts.diff pyfiglet-0.7.4+dfsg/debian/patches/bad-toilet-fonts.diff --- pyfiglet-0.7.4+dfsg/debian/patches/bad-toilet-fonts.diff 2015-07-04 04:25:29.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/patches/bad-toilet-fonts.diff 2018-08-27 10:55:20.000000000 +0000 @@ -1,12 +1,20 @@ -Description: Skip some toilet fonts from the test suite. - They don't all pass, beacuse pyfiglet doesn't have perfect .tlf handling yet. -Author: Stefano Rivera +From: Stefano Rivera +Date: Thu, 8 Oct 2015 10:29:40 -0700 +Subject: Skip some toilet fonts from the test suite. + +They don't all pass, because pyfiglet doesn't have perfect .tlf handling yet. + Forwarded: https://github.com/pwaller/pyfiglet/pull/44 Last-Updated: 2015-07-03 +--- + pyfiglet/test.py | 2 ++ + 1 file changed, 2 insertions(+) +diff --git a/pyfiglet/test.py b/pyfiglet/test.py +index fe28087..d57a915 100755 --- a/pyfiglet/test.py +++ b/pyfiglet/test.py -@@ -34,6 +34,8 @@ +@@ -34,6 +34,8 @@ class Test(object): self.failed = [] self.oked = [] self.skip = ['runic','pyramid','eftifont'] # known bug.. diff -Nru pyfiglet-0.7.4+dfsg/debian/patches/debian-defaults.diff pyfiglet-0.7.4+dfsg/debian/patches/debian-defaults.diff --- pyfiglet-0.7.4+dfsg/debian/patches/debian-defaults.diff 2015-07-04 04:25:29.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/patches/debian-defaults.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Debian figlet defaults. - Change defaults to be toilet-compatible (font: future) -Author: Stefano Rivera -Forwarded: not-needed -Last-Update: 2011-05-29 - ---- a/pyfiglet/__init__.py -+++ b/pyfiglet/__init__.py -@@ -36,7 +36,7 @@ - """ - - --DEFAULT_FONT = 'standard' -+DEFAULT_FONT = 'future' - - - def figlet_format(text, font=DEFAULT_FONT, **kwargs): diff -Nru pyfiglet-0.7.4+dfsg/debian/patches/font-location.diff pyfiglet-0.7.4+dfsg/debian/patches/font-location.diff --- pyfiglet-0.7.4+dfsg/debian/patches/font-location.diff 2015-07-04 04:25:29.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/patches/font-location.diff 2018-08-27 10:55:20.000000000 +0000 @@ -1,12 +1,22 @@ -Description: Use Debian's figlet fonts. - Look in /usr/share/figlet rather than using pkg_resources to find fonts. -Author: Stefano Rivera +From: Stefano Rivera +Date: Thu, 8 Oct 2015 10:29:38 -0700 +Subject: Use Debian's figlet fonts. + +Look in /usr/share/figlet rather than using pkg_resources to find fonts. + Forwarded: not-needed Last-Update: 2014-07-26 +--- + pyfiglet/__init__.py | 10 +++++----- + pyfiglet/test.py | 6 +++--- + setup.py | 3 +-- + 3 files changed, 9 insertions(+), 10 deletions(-) +diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py +index 7329746..a33eaf8 100755 --- a/pyfiglet/__init__.py +++ b/pyfiglet/__init__.py -@@ -7,7 +7,7 @@ +@@ -7,7 +7,7 @@ Python FIGlet adaption from __future__ import print_function, unicode_literals @@ -15,7 +25,7 @@ import re import sys from optparse import OptionParser -@@ -97,8 +97,8 @@ +@@ -97,8 +97,8 @@ class FigletFont(object): """ for extension in ('tlf', 'flf'): fn = '%s.%s' % (font, extension) @@ -26,7 +36,7 @@ data = data.decode('UTF-8', 'replace') return data else: -@@ -108,7 +108,7 @@ +@@ -108,7 +108,7 @@ class FigletFont(object): def isValidFont(cls, font): if not font.endswith(('.flf', '.tlf')): return False @@ -35,7 +45,7 @@ header = f.readline().decode('UTF-8', 'replace') f.close() return cls.reMagicNumber.search(header) -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ class FigletFont(object): @classmethod def getFonts(cls): return [font.rsplit('.', 2)[0] for font @@ -44,21 +54,11 @@ if cls.isValidFont(font)] @classmethod ---- a/setup.py -+++ b/setup.py -@@ -46,8 +46,7 @@ - author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)', - author_email='peter.waller@gmail.com', - url='https://github.com/pwaller/pyfiglet', -- packages=['pyfiglet', 'pyfiglet.fonts'], -- package_data={'pyfiglet.fonts': ['*.flf']}, -+ packages=['pyfiglet'], - entry_points={ - 'console_scripts': [ - 'pyfiglet = pyfiglet:main', +diff --git a/pyfiglet/test.py b/pyfiglet/test.py +index 6872201..fe28087 100755 --- a/pyfiglet/test.py +++ b/pyfiglet/test.py -@@ -38,9 +38,9 @@ +@@ -38,9 +38,9 @@ class Test(object): def outputUsingFigletorToilet(self, text, font, fontpath): if os.path.isfile(fontpath + '.flf'): @@ -70,7 +70,7 @@ else: raise Exception('Missing font file: '+fontpath) -@@ -71,7 +71,7 @@ +@@ -71,7 +71,7 @@ class Test(object): def check_font(self, text, font): if font in self.skip: return @@ -79,3 +79,17 @@ self.f.setFont(font=font) +diff --git a/setup.py b/setup.py +index 43cba4d..10095c6 100755 +--- a/setup.py ++++ b/setup.py +@@ -46,8 +46,7 @@ setup( + author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)', + author_email='peter.waller@gmail.com', + url='https://github.com/pwaller/pyfiglet', +- packages=['pyfiglet', 'pyfiglet.fonts'], +- package_data={'pyfiglet.fonts': ['*.flf']}, ++ packages=['pyfiglet'], + entry_points={ + 'console_scripts': [ + 'pyfiglet = pyfiglet:main', diff -Nru pyfiglet-0.7.4+dfsg/debian/patches/no-entry-points.diff pyfiglet-0.7.4+dfsg/debian/patches/no-entry-points.diff --- pyfiglet-0.7.4+dfsg/debian/patches/no-entry-points.diff 2014-07-27 19:01:55.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/patches/no-entry-points.diff 2018-08-27 10:55:20.000000000 +0000 @@ -1,12 +1,20 @@ -Description: Don't install setuptools entry point scripts. - We have our own command line wrapper. -Author: Stefano Rivera +From: Stefano Rivera +Date: Thu, 8 Oct 2015 10:29:39 -0700 +Subject: Don't install setuptools entry point scripts. + +We have our own command line wrapper. + Forwarded: not-needed Last-Update: 2014-07-27 +--- + setup.py | 5 ----- + 1 file changed, 5 deletions(-) +diff --git a/setup.py b/setup.py +index 10095c6..4d16851 100755 --- a/setup.py +++ b/setup.py -@@ -47,9 +47,4 @@ +@@ -47,9 +47,4 @@ setup( author_email='peter.waller@gmail.com', url='https://github.com/pwaller/pyfiglet', packages=['pyfiglet'], diff -Nru pyfiglet-0.7.4+dfsg/debian/patches/py3k.diff pyfiglet-0.7.4+dfsg/debian/patches/py3k.diff --- pyfiglet-0.7.4+dfsg/debian/patches/py3k.diff 2015-07-04 05:12:17.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/patches/py3k.diff 2018-08-27 10:55:20.000000000 +0000 @@ -1,11 +1,18 @@ -Description: In Python 3, args are already decoded -Author: Stefano Rivera +From: Stefano Rivera +Date: Thu, 8 Oct 2015 10:29:41 -0700 +Subject: In Python 3, args are already decoded + Forwarded: https://github.com/pwaller/pyfiglet/pull/45 Last-Updated: 2015-07-03 +--- + pyfiglet/__init__.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py +index a33eaf8..ff0bea5 100755 --- a/pyfiglet/__init__.py +++ b/pyfiglet/__init__.py -@@ -791,7 +791,8 @@ +@@ -791,7 +791,8 @@ def main(): parser.print_help() return 1 diff -Nru pyfiglet-0.7.4+dfsg/debian/tests/smoketest pyfiglet-0.7.4+dfsg/debian/tests/smoketest --- pyfiglet-0.7.4+dfsg/debian/tests/smoketest 2014-07-27 19:01:55.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/tests/smoketest 2018-08-27 10:55:20.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh set -efu -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" python -m pyfiglet --help python -m pyfiglet hello there diff -Nru pyfiglet-0.7.4+dfsg/debian/tests/smoketest3 pyfiglet-0.7.4+dfsg/debian/tests/smoketest3 --- pyfiglet-0.7.4+dfsg/debian/tests/smoketest3 2014-07-27 19:01:55.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/tests/smoketest3 2018-08-27 10:55:20.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh set -efu -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" pyfiglet --help pyfiglet hello there diff -Nru pyfiglet-0.7.4+dfsg/debian/tests/suite pyfiglet-0.7.4+dfsg/debian/tests/suite --- pyfiglet-0.7.4+dfsg/debian/tests/suite 2014-07-27 19:01:55.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/tests/suite 2018-08-27 10:55:20.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh set -efu -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" for py in $(pyversions --supported); do $py -m pyfiglet.test diff -Nru pyfiglet-0.7.4+dfsg/debian/tests/suite3 pyfiglet-0.7.4+dfsg/debian/tests/suite3 --- pyfiglet-0.7.4+dfsg/debian/tests/suite3 2014-07-27 19:01:55.000000000 +0000 +++ pyfiglet-0.7.4+dfsg/debian/tests/suite3 2018-08-27 10:55:20.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh set -efu -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" for py in $(py3versions --supported); do $py -m pyfiglet.test