Upgrading to GitLab 11.11.0.

Commit ae9ed3ac authored by Stefano Rivera's avatar Stefano Rivera

* New upstream release.

* Refresh patches.
* figlet is now free, and in main:
  - Drop patch debian-defaults.
  - Build-Depend on figlet, for tests.
  - Recommend figlet, as well as toilet-fonts.
* Patch bad-toilet-fonts: The test suite upstream has got stricter, but
  fails on some toilet fonts. Skip them.
* Drop XS-Testsuite field, now unnecessary.
parent 43f5b47a
pyfiglet (0.7.2+dfsg-2) UNRELEASED; urgency=medium
pyfiglet (0.7.4+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Refresh patches.
* debian/watch:
- Switch to dversionmangle and repacksuffix, now that it exists.
- Switch from the deprecated githubredir.d.n to github's tag view.
* figlet is now free, and in main:
- Drop patch debian-defaults.
- Build-Depend on figlet, for tests.
- Recommend figlet, as well as toilet-fonts.
* Patch bad-toilet-fonts: The test suite upstream has got stricter, but
fails on some toilet fonts. Skip them.
* Drop XS-Testsuite field, now unnecessary.
-- Stefano Rivera <stefanor@debian.org> Fri, 17 Oct 2014 19:35:51 -0700
......
......@@ -6,6 +6,7 @@ Uploaders: Stefano Rivera <stefanor@debian.org>
Build-Depends:
debhelper (>= 8.1),
dh-python,
figlet,
python-all (>= 2.6),
python-setuptools,
python3-all,
......@@ -13,7 +14,6 @@ Build-Depends:
toilet
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.1
XS-Testsuite: autopkgtest
Standards-Version: 3.9.6
Homepage: https://github.com/pwaller/pyfiglet
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyfiglet/trunk/
......@@ -22,8 +22,7 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyfiglet/t
Package: python-pyfiglet
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
Recommends: toilet-fonts
Suggests: figlet
Recommends: figlet, toilet-fonts
Description: Python port of the FIGlet specification
FIGLet is a program that creates large characters out of ordinary screen
characters. It takes ASCII text and renders it in ASCII art fonts.
......@@ -34,8 +33,7 @@ Description: Python port of the FIGlet specification
Package: python3-pyfiglet
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}
Recommends: toilet-fonts
Suggests: figlet
Recommends: figlet, toilet-fonts
Breaks: python-pyfiglet (<< 0.7.1)
Replaces: python-pyfiglet (<< 0.7.1)
Description: Python 3 port of the FIGlet specification
......
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 <stefanor@debian.org>
Forwarded: https://github.com/pwaller/pyfiglet/pull/44
Last-Updated: 2015-07-03
--- a/pyfiglet/test.py
+++ b/pyfiglet/test.py
@@ -34,6 +34,8 @@
self.failed = []
self.oked = []
self.skip = ['runic','pyramid','eftifont'] # known bug..
+ self.skip += ['emboss', 'emboss2', 'future', 'letter', 'pagga',
+ 'smblock', 'smbraille', 'wideterm']
self.f = Figlet()
def outputUsingFigletorToilet(self, text, font, fontpath):
......@@ -6,7 +6,7 @@ Last-Update: 2011-05-29
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -35,7 +35,7 @@
@@ -36,7 +36,7 @@
"""
......
......@@ -6,7 +6,7 @@ Last-Update: 2014-07-26
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -6,7 +6,7 @@
@@ -7,7 +7,7 @@
from __future__ import print_function, unicode_literals
......@@ -15,7 +15,7 @@ Last-Update: 2014-07-26
import re
import sys
from optparse import OptionParser
@@ -92,8 +92,8 @@
@@ -97,8 +97,8 @@
"""
for extension in ('tlf', 'flf'):
fn = '%s.%s' % (font, extension)
......@@ -26,15 +26,16 @@ Last-Update: 2014-07-26
data = data.decode('UTF-8', 'replace')
return data
else:
@@ -103,14 +103,14 @@
@@ -108,7 +108,7 @@
def isValidFont(cls, font):
if not font.endswith(('.flf', '.tlf')):
return False
- f = pkg_resources.resource_stream('pyfiglet.fonts', font)
+ f = open(os.path.join('/usr/share/figlet', font), 'rb')
header = f.readline().decode('UTF-8', 'replace')
f.close()
return cls.reMagicNumber.search(header)
@@ -116,7 +116,7 @@
@classmethod
def getFonts(cls):
return [font.rsplit('.', 2)[0] for font
......@@ -57,18 +58,24 @@ Last-Update: 2014-07-26
'pyfiglet = pyfiglet:main',
--- a/pyfiglet/test.py
+++ b/pyfiglet/test.py
@@ -39,11 +39,11 @@
outputPyfiglet = f.renderText('foo')
@@ -38,9 +38,9 @@
- fontpath = os.path.join('pyfiglet', 'fonts', font)
+ fontpath = os.path.join('/usr/share/figlet', font)
def outputUsingFigletorToilet(self, text, font, fontpath):
if os.path.isfile(fontpath + '.flf'):
- cmd = ('figlet', '-d', 'pyfiglet/fonts', '-f', font, 'foo')
+ cmd = ('figlet', '-d', '/usr/share/figlet', '-f', font, 'foo')
- cmd = ('figlet', '-d', 'pyfiglet/fonts', '-f', font, text)
+ cmd = ('figlet', '-d', '/usr/share/figlet', '-f', font, text)
elif os.path.isfile(fontpath + '.tlf'):
- cmd = ('toilet', '-d', 'pyfiglet/fonts', '-f', font, 'foo')
+ cmd = ('toilet', '-d', '/usr/share/figlet', '-f', font, 'foo')
- cmd = ('toilet', '-d', 'pyfiglet/fonts', '-f', font, text)
+ cmd = ('toilet', '-d', '/usr/share/figlet', '-f', font, text)
else:
raise Exception('Missing font file: '+fontpath)
@@ -71,7 +71,7 @@
def check_font(self, text, font):
if font in self.skip:
return
- fontpath = os.path.join('pyfiglet', 'fonts', font)
+ fontpath = os.path.join('/usr/share/figlet', font)
self.f.setFont(font=font)
debian-defaults.diff
font-location.diff
no-entry-points.diff
bad-toilet-fonts.diff
......@@ -5,7 +5,7 @@ Tests: smoketest3
Depends: python3-pyfiglet, toilet-fonts
Tests: suite
Depends: python-all, python-pyfiglet, toilet
Depends: python-all, python-pyfiglet, figlet, toilet
Tests: suite3
Depends: python3-all, python3-pyfiglet, toilet
Depends: python3-all, python3-pyfiglet, figlet, toilet
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment