Hi, Because of the bugs 1049331, 1042120, 1053630, 1053842, 1053840, 1053841, 1049331 and 1042205 I worked on an update of the blockdiag package.
We made a delayed upload for it, by the time I'm sending this email there are 5 days left for the package to arrive in the archive. Blockdiag is a dependency of one of the packages I maintain (flask-dance). After the pillow update to 10.0.1 release, several functions for computing the size and offset of rendered text were removed. I cherry-picked a patch from upstream to fix theses breaking changes. All the bugs listed above are going to be fixed by this upload. I attached the debdiff with my modifications. -- Sergio Cipriano.
diff -Nru blockdiag-2.0.1+dfsg/debian/blockdiag/circle.eps
blockdiag-2.0.1+dfsg/debian/blockdiag/circle.eps
--- blockdiag-2.0.1+dfsg/debian/blockdiag/circle.eps 2021-02-01
11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/blockdiag/circle.eps 1970-01-01
01:00:00.000000000 +0100
@@ -1,202 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: graphviz version 2.38.0 (20140413.2041)
-%%Title: g
-%%Pages: 1
-%%BoundingBox: 36 36 80 80
-%%EndComments
-save
-%%BeginProlog
-/DotDict 200 dict def
-DotDict begin
-
-/setupLatin1 {
-mark
-/EncodingVector 256 array def
- EncodingVector 0
-
-ISOLatin1Encoding 0 255 getinterval putinterval
-EncodingVector 45 /hyphen put
-
-% Set up ISO Latin 1 character encoding
-/starnetISO {
- dup dup findfont dup length dict begin
- { 1 index /FID ne { def }{ pop pop } ifelse
- } forall
- /Encoding EncodingVector def
- currentdict end definefont
-} def
-/Times-Roman starnetISO def
-/Times-Italic starnetISO def
-/Times-Bold starnetISO def
-/Times-BoldItalic starnetISO def
-/Helvetica starnetISO def
-/Helvetica-Oblique starnetISO def
-/Helvetica-Bold starnetISO def
-/Helvetica-BoldOblique starnetISO def
-/Courier starnetISO def
-/Courier-Oblique starnetISO def
-/Courier-Bold starnetISO def
-/Courier-BoldOblique starnetISO def
-cleartomark
-} bind def
-
-%%BeginResource: procset graphviz 0 0
-/coord-font-family /Times-Roman def
-/default-font-family /Times-Roman def
-/coordfont coord-font-family findfont 8 scalefont def
-
-/InvScaleFactor 1.0 def
-/set_scale {
- dup 1 exch div /InvScaleFactor exch def
- scale
-} bind def
-
-% styles
-/solid { [] 0 setdash } bind def
-/dashed { [9 InvScaleFactor mul dup ] 0 setdash } bind def
-/dotted { [1 InvScaleFactor mul 6 InvScaleFactor mul] 0 setdash } bind def
-/invis {/fill {newpath} def /stroke {newpath} def /show {pop newpath} def}
bind def
-/bold { 2 setlinewidth } bind def
-/filled { } bind def
-/unfilled { } bind def
-/rounded { } bind def
-/diagonals { } bind def
-/tapered { } bind def
-
-% hooks for setting color
-/nodecolor { sethsbcolor } bind def
-/edgecolor { sethsbcolor } bind def
-/graphcolor { sethsbcolor } bind def
-/nopcolor {pop pop pop} bind def
-
-/beginpage { % i j npages
- /npages exch def
- /j exch def
- /i exch def
- /str 10 string def
- npages 1 gt {
- gsave
- coordfont setfont
- 0 0 moveto
- (\() show i str cvs show (,) show j str cvs show (\))
show
- grestore
- } if
-} bind def
-
-/set_font {
- findfont exch
- scalefont setfont
-} def
-
-% draw text fitted to its expected width
-/alignedtext { % width text
- /text exch def
- /width exch def
- gsave
- width 0 gt {
- [] 0 setdash
- text stringwidth pop width exch sub text length div 0
text ashow
- } if
- grestore
-} def
-
-/boxprim { % xcorner ycorner xsize ysize
- 4 2 roll
- moveto
- 2 copy
- exch 0 rlineto
- 0 exch rlineto
- pop neg 0 rlineto
- closepath
-} bind def
-
-/ellipse_path {
- /ry exch def
- /rx exch def
- /y exch def
- /x exch def
- matrix currentmatrix
- newpath
- x y translate
- rx ry scale
- 0 0 1 0 360 arc
- setmatrix
-} bind def
-
-/endpage { showpage } bind def
-/showpage { } def
-
-/layercolorseq
- [ % layer color sequence - darkest to lightest
- [0 0 0]
- [.2 .8 .8]
- [.4 .8 .8]
- [.6 .8 .8]
- [.8 .8 .8]
- ]
-def
-
-/layerlen layercolorseq length def
-
-/setlayer {/maxlayer exch def /curlayer exch def
- layercolorseq curlayer 1 sub layerlen mod get
- aload pop sethsbcolor
- /nodecolor {nopcolor} def
- /edgecolor {nopcolor} def
- /graphcolor {nopcolor} def
-} bind def
-
-/onlayer { curlayer ne {invis} if } def
-
-/onlayers {
- /myupper exch def
- /mylower exch def
- curlayer mylower lt
- curlayer myupper gt
- or
- {invis} if
-} def
-
-/curlayer 0 def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-14 default-font-family set_font
-1 setmiterlimit
-% /arrowlength 10 def
-% /arrowwidth 5 def
-
-% make sure pdfmark is harmless for PS-interpreters other than Distiller
-/pdfmark where {pop} {userdict /pdfmark /cleartomark load put} ifelse
-% make '<<' and '>>' safe on PS Level 1 devices
-/languagelevel where {pop languagelevel}{1} ifelse
-2 lt {
- userdict (<<) cvn ([) cvn load put
- userdict (>>) cvn ([) cvn load put
-} if
-
-%%EndSetup
-setupLatin1
-%%Page: 1 1
-%%PageBoundingBox: 36 36 80 80
-%%PageOrientation: Portrait
-0 0 1 beginpage
-gsave
-36 36 44 44 boxprim clip newpath
-1 1 set_scale 0 rotate 40 40 translate
-% a
-gsave
-1 setlinewidth
-0 0 0 nodecolor
-18 18 18 18 ellipse_path stroke
-grestore
-endpage
-showpage
-grestore
-%%PageTrailer
-%%EndPage: 1
-%%Trailer
-end
-restore
-%%EOF
diff -Nru blockdiag-2.0.1+dfsg/debian/blockdiag/circle.svg
blockdiag-2.0.1+dfsg/debian/blockdiag/circle.svg
--- blockdiag-2.0.1+dfsg/debian/blockdiag/circle.svg 2021-02-01
11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/blockdiag/circle.svg 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg";>
- <title>circle</title>
- <circle cx="50" cy="50" r="50" stroke="black" stroke-width="1" fill="black" />
-</svg>
diff -Nru blockdiag-2.0.1+dfsg/debian/changelog
blockdiag-2.0.1+dfsg/debian/changelog
--- blockdiag-2.0.1+dfsg/debian/changelog 2021-02-01 11:56:59.000000000
+0000
+++ blockdiag-2.0.1+dfsg/debian/changelog 2023-10-19 03:03:49.000000000
+0100
@@ -1,3 +1,25 @@
+blockdiag (2.0.1+dfsg-2) unstable; urgency=high
+
+ * Refresh patches, add standard DEP-3 fields to all patches.
+ * Add d/p/0009-Add-support-for-Pillow-10.patch:
+ + Pillow (PIL) 10.0.1 removed several functions for computing the size and
+ offset of rendered text. The patch, which was cherry-picked from upstream,
+ fixes these breaking changes in a backwards compatible way (Closes:
+ #1049331, #1042205).
+ * Remove d/blockdiag folder, it was being used for nothing.
+ * d/copyright: Change URIs to use HTTPS.
+ * d/control:
+ + Remove redundant build dependency.
+ - The python3-docutils build dependency is listed more
+ than one time when one would be sufficient.
+ + Set Rules-Requires-Root to no.
+ - This package does not require fakeroot or root privileges.
+ + Add VCS fields pointing to salsa.debian.org (Closes: #850871).
+ + Bump Standards-Version from 4.5.1 to 4.6.2, no changes needed.
+ + Move blockdiag to the Python team and add myself as uploader.
+
+ -- Sergio de Almeida Cipriano Junior <sergios...@riseup.net> Wed, 18 Oct
2023 23:03:49 -0300
+
blockdiag (2.0.1+dfsg-1) unstable; urgency=medium
* New upstream release.
diff -Nru blockdiag-2.0.1+dfsg/debian/control
blockdiag-2.0.1+dfsg/debian/control
--- blockdiag-2.0.1+dfsg/debian/control 2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/control 2023-10-19 03:03:49.000000000 +0100
@@ -1,7 +1,9 @@
Source: blockdiag
Section: python
Priority: optional
-Maintainer: Kouhei Maeda <mkou...@palmtb.net>
+Maintainer: Debian Python Team <team+pyt...@tracker.debian.org>
+Uploaders: Kouhei Maeda <mkou...@palmtb.net>,
+ Sergio de Almeida Cipriano Junior <sergios...@riseup.net>
Build-Depends: debhelper-compat (= 13),
dh-python,
libmagickcore-6.q16-3-extra,
@@ -12,7 +14,6 @@
python3-setuptools,
python3-nose,
python3-funcparserlib (>= 0.3.4),
- python3-docutils,
python3-pil,
python3-webcolors,
python3-reportlab,
@@ -20,8 +21,11 @@
python3-wand,
python3-zc.buildout,
fonts-vlgothic | fonts-japanese-gothic
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
Homepage: http://blockdiag.com/
+Vcs-Browser: https://salsa.debian.org/python-team/packages/blockdiag
+Vcs-Git: https://salsa.debian.org/python-team/packages/blockdiag.git
+Rules-Requires-Root: no
Package: python3-blockdiag
Architecture: all
@@ -34,5 +38,5 @@
Description: generate block-diagram image file from spec-text file for Python 3
For Python 3.
Generate block-diagram from dot like text with multilingualization for
- node-label. But this supports utf-8 only. It is able to embed to sphinx with
+ node-label. But this supports utf-8 only. It is able to embed to sphinx with
using python-sphinxcontrib-blockdiag.
diff -Nru blockdiag-2.0.1+dfsg/debian/copyright
blockdiag-2.0.1+dfsg/debian/copyright
--- blockdiag-2.0.1+dfsg/debian/copyright 2021-02-01 11:56:59.000000000
+0000
+++ blockdiag-2.0.1+dfsg/debian/copyright 2023-10-19 03:03:49.000000000
+0100
@@ -1,6 +1,6 @@
-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: blockdiag
-Source: http://pypi.python.org/pypi/blockdiag/
+Source: https://pypi.python.org/pypi/blockdiag/
Files-Excluded:
src/blockdiag/tests/VLGothic/*
diff -Nru
blockdiag-2.0.1+dfsg/debian/patches/0009-Add-support-for-Pillow-10.patch
blockdiag-2.0.1+dfsg/debian/patches/0009-Add-support-for-Pillow-10.patch
--- blockdiag-2.0.1+dfsg/debian/patches/0009-Add-support-for-Pillow-10.patch
1970-01-01 01:00:00.000000000 +0100
+++ blockdiag-2.0.1+dfsg/debian/patches/0009-Add-support-for-Pillow-10.patch
2023-10-19 03:03:49.000000000 +0100
@@ -0,0 +1,117 @@
+From: Theodore Ni <3806110+t...@users.noreply.github.com>
+Date: Sat, 5 Aug 2023 10:43:46 -0700
+Subject: Add support for Pillow 10
+Origin: upstream, https://github.com/blockdiag/blockdiag/pull/179
+
+Fix a bunch of breaking changes in a backwards compatible way.
+---
+ src/blockdiag/imagedraw/png.py | 47 +++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 39 insertions(+), 8 deletions(-)
+
+diff --git a/src/blockdiag/imagedraw/png.py b/src/blockdiag/imagedraw/png.py
+index 3cac05a..12f0514 100644
+--- a/src/blockdiag/imagedraw/png.py
++++ b/src/blockdiag/imagedraw/png.py
+@@ -30,6 +30,21 @@ from blockdiag.utils.fontmap import FontMap, parse_fontpath
+ from blockdiag.utils.myitertools import istep, stepslice
+
+
++# to support pillow < 9.1.0
++if not hasattr(Image, 'Resampling'):
++ from enum import IntEnum
++
++ class Resampling(IntEnum):
++ NEAREST = 0
++ BOX = 4
++ BILINEAR = 2
++ HAMMING = 5
++ BICUBIC = 3
++ LANCZOS = 1
++
++ Image.Resampling = Resampling
++
++
+ def point_pairs(xylist):
+ iterable = iter(xylist)
+ for pt in iterable:
+@@ -147,7 +162,7 @@ class ImageDrawExBase(base.ImageDraw):
+ self.draw = ImageDraw.Draw(self._image)
+
+ def resizeCanvas(self, size):
+- self._image = self._image.resize(size, Image.ANTIALIAS)
++ self._image = self._image.resize(size, Image.Resampling.LANCZOS)
+ self.draw = ImageDraw.Draw(self._image)
+
+ def arc(self, box, start, end, **kwargs):
+@@ -273,13 +288,21 @@ class ImageDrawExBase(base.ImageDraw):
+ def textlinesize(self, string, font):
+ ttfont = ttfont_for(font)
+ if ttfont is None:
+- size = self.draw.textsize(string, font=None)
++ if hasattr(self.draw, 'textbbox'):
++ left, top, right, bottom = self.draw.textbbox((0, 0), string)
++ size = (right - left, bottom - top)
++ else:
++ size = self.draw.textsize(string, font=None)
+
+ font_ratio = font.size * 1.0 / FontMap.BASE_FONTSIZE
+ size = Size(int(size[0] * font_ratio),
+ int(size[1] * font_ratio))
+ else:
+- size = Size(*ttfont.getsize(string))
++ if hasattr(ttfont, 'getbbox'):
++ left, top, right, bottom = ttfont.getbbox(string)
++ size = Size(right - left, bottom - top)
++ else:
++ size = Size(*ttfont.getsize(string))
+
+ return size
+
+@@ -291,7 +314,11 @@ class ImageDrawExBase(base.ImageDraw):
+ if self.scale_ratio == 1 and font.size == FontMap.BASE_FONTSIZE:
+ self.draw.text(xy, string, fill=fill)
+ else:
+- size = self.draw.textsize(string)
++ if hasattr(self.draw, 'textbbox'):
++ left, top, right, bottom = self.draw.textbbox((0, 0),
string)
++ size = (right - left, bottom - top)
++ else:
++ size = self.draw.textsize(string)
+ image = Image.new('RGBA', size)
+ draw = ImageDraw.Draw(image)
+ draw.text((0, 0), string, fill=fill)
+@@ -299,10 +326,14 @@ class ImageDrawExBase(base.ImageDraw):
+
+ basesize = (size[0] * self.scale_ratio,
+ size[1] * self.scale_ratio)
+- text_image = image.resize(basesize, Image.ANTIALIAS)
++ text_image = image.resize(basesize, Image.Resampling.LANCZOS)
+ self.paste(text_image, xy, text_image)
+ else:
+- size = ttfont.getsize(string)
++ if hasattr(ttfont, 'getbbox'):
++ left, top, right, bottom = ttfont.getbbox(string)
++ size = (right - left, bottom - top)
++ else:
++ size = ttfont.getsize(string)
+
+ # Generate mask to support BDF(bitmap font)
+ mask = Image.new('1', size)
+@@ -370,7 +401,7 @@ class ImageDrawExBase(base.ImageDraw):
+ # resize image.
+ w = min([box.width, image.size[0] * self.scale_ratio])
+ h = min([box.height, image.size[1] * self.scale_ratio])
+- image.thumbnail((w, h), Image.ANTIALIAS)
++ image.thumbnail((w, h), Image.Resampling.LANCZOS)
+
+ # centering image.
+ w, h = image.size
+@@ -404,7 +435,7 @@ class ImageDrawExBase(base.ImageDraw):
+ y = int(self._image.size[1] / self.scale_ratio)
+ size = (x, y)
+
+- self._image.thumbnail(size, Image.ANTIALIAS)
++ self._image.thumbnail(size, Image.Resampling.LANCZOS)
+
+ if self.filename:
+ self._image.save(self.filename, _format)
diff -Nru
blockdiag-2.0.1+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
blockdiag-2.0.1+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
---
blockdiag-2.0.1+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
2021-02-01 11:56:59.000000000 +0000
+++
blockdiag-2.0.1+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,5 +1,8 @@
-Description: Fix test failure with wand 0.4.1+
-
+From: Rebecca Palmer <rebecca_pal...@zoho.com>
+Subject: Fix test failure with wand 0.4.1+
+Bug-Debian: https://bugs.debian.org/848748
+Forwarded: no
+
wand 0.4.1 added an Image.destroy()
(https://sources.debian.net/src/wand/0.4.4-1/wand/image.py/#L2760) that
iterates over self.sequence (the frames of an animation) to free their
@@ -13,16 +16,15 @@
containing "Traceback", including this warning message.
This patch ignores this message to allow blockdiag to build.
+---
+ src/blockdiag/tests/utils.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
-Author: Rebecca Palmer <rebecca_pal...@zoho.com>
-Bug-Debian: https://bugs.debian.org/848748
-Forwarded: no
-
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/utils.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/utils.py 2021-01-31
23:23:07.242772141 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/utils.py 2021-01-31
23:23:07.238772142 +0900
-@@ -74,7 +74,14 @@
+diff --git a/src/blockdiag/tests/utils.py b/src/blockdiag/tests/utils.py
+index 904f438..77c67a2 100644
+--- a/src/blockdiag/tests/utils.py
++++ b/src/blockdiag/tests/utils.py
+@@ -74,7 +74,14 @@ def capture_stderr(func):
func(*args, **kwargs)
diff -Nru blockdiag-2.0.1+dfsg/debian/patches/Fixed-remote-image-resouces.patch
blockdiag-2.0.1+dfsg/debian/patches/Fixed-remote-image-resouces.patch
--- blockdiag-2.0.1+dfsg/debian/patches/Fixed-remote-image-resouces.patch
2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/Fixed-remote-image-resouces.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,11 +1,15 @@
-Description: Changes remote image resource to local files from base packages.
-Author: Kouhei Maeda <mkou...@palmtb.net>
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: Changes remote image resource to local files from base packages.
Last-Update: 2021-01-31
+---
+ src/blockdiag/tests/diagrams/background_url_image.diag | 9 +++++----
+ src/blockdiag/tests/diagrams/node_icon.diag | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
-Index:
blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
-===================================================================
----
blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag
2021-01-31 23:18:56.102782440 +0900
-+++
blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
2021-01-31 23:19:30.122781045 +0900
+diff --git a/src/blockdiag/tests/diagrams/background_url_image.diag
b/src/blockdiag/tests/diagrams/background_url_image.diag
+index 18183a9..450258e 100644
+--- a/src/blockdiag/tests/diagrams/background_url_image.diag
++++ b/src/blockdiag/tests/diagrams/background_url_image.diag
@@ -1,7 +1,8 @@
{
- A [background = "http://python.org/images/python-logo.gif";];
@@ -19,10 +23,10 @@
+ E [background = "circle.svg"];
Z;
}
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/diagrams/node_icon.diag
2021-01-31 23:18:56.102782440 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
2021-01-31 23:19:54.734780036 +0900
+diff --git a/src/blockdiag/tests/diagrams/node_icon.diag
b/src/blockdiag/tests/diagrams/node_icon.diag
+index 5a81785..d470ccc 100644
+--- a/src/blockdiag/tests/diagrams/node_icon.diag
++++ b/src/blockdiag/tests/diagrams/node_icon.diag
@@ -2,5 +2,5 @@
A -> B;
diff -Nru blockdiag-2.0.1+dfsg/debian/patches/fixes-test_node_attribute.patch
blockdiag-2.0.1+dfsg/debian/patches/fixes-test_node_attribute.patch
--- blockdiag-2.0.1+dfsg/debian/patches/fixes-test_node_attribute.patch
2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/fixes-test_node_attribute.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,12 +1,16 @@
-Description: Fixes test_node_attribute
(blockdiag.tests.test_builder_node.TestBuilderNode).
-Author: Kouhei Maeda <mkou...@palmtb.net>
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: Fixes test_node_attribute
+ (blockdiag.tests.test_builder_node.TestBuilderNode).
Last-Update: 2021-01-31
+---
+ src/blockdiag/tests/test_builder_node.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_builder_node.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/test_builder_node.py
2021-01-31 23:21:39.398775744 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_builder_node.py
2021-01-31 23:22:15.638774258 +0900
-@@ -97,8 +97,8 @@
+diff --git a/src/blockdiag/tests/test_builder_node.py
b/src/blockdiag/tests/test_builder_node.py
+index e4e2fcd..4bc7921 100644
+--- a/src/blockdiag/tests/test_builder_node.py
++++ b/src/blockdiag/tests/test_builder_node.py
+@@ -97,8 +97,8 @@ class TestBuilderNode(BuilderTestCase):
orientations = defaultdict(lambda: 'horizontal')
orientations['J'] = 'vertical'
backgrounds = defaultdict(lambda: None)
diff -Nru
blockdiag-2.0.1+dfsg/debian/patches/remove-one-assert-in-test_node_attribute.patch
blockdiag-2.0.1+dfsg/debian/patches/remove-one-assert-in-test_node_attribute.patch
---
blockdiag-2.0.1+dfsg/debian/patches/remove-one-assert-in-test_node_attribute.patch
2021-02-01 11:56:59.000000000 +0000
+++
blockdiag-2.0.1+dfsg/debian/patches/remove-one-assert-in-test_node_attribute.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,14 +1,17 @@
-Description: Remove one assert in test_node_attribute
-Author: Thomas Goirand <z...@debian.org>
+From: Thomas Goirand <z...@debian.org>
+Subject: Remove one assert in test_node_attribute
Bug-Debian: https://bugs.debian.org/880235
Forwarded: no
Last-Update: 2021-01-31
+---
+ src/blockdiag/tests/test_builder_node.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_builder_node.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/test_builder_node.py
2021-01-31 23:23:21.702771548 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_builder_node.py
2021-01-31 23:23:21.702771548 +0900
-@@ -109,7 +109,7 @@
+diff --git a/src/blockdiag/tests/test_builder_node.py
b/src/blockdiag/tests/test_builder_node.py
+index 4bc7921..e8fa058 100644
+--- a/src/blockdiag/tests/test_builder_node.py
++++ b/src/blockdiag/tests/test_builder_node.py
+@@ -109,7 +109,7 @@ class TestBuilderNode(BuilderTestCase):
self.assertNodeStacked(diagram, stacked)
self.assertNodeFontsize(diagram, fontsize)
self.assertNodeLabel_Orientation(diagram, orientations)
diff -Nru blockdiag-2.0.1+dfsg/debian/patches/rename-test-data-file.patch
blockdiag-2.0.1+dfsg/debian/patches/rename-test-data-file.patch
--- blockdiag-2.0.1+dfsg/debian/patches/rename-test-data-file.patch
2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/rename-test-data-file.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,10 +1,21 @@
-Description: Fixes package-contains-documentation-outside-usr-share-doc for
testing data
-Author: Kouhei Maeda <mkou...@palmtb.net>
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: Fixes package-contains-documentation-outside-usr-share-doc for
+ testing data
Last-Update: 2021-02-01
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/README
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/diagrams/README
2021-01-31 23:34:47.910743408 +0900
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+
+---
+ src/blockdiag/tests/diagrams/README | 12 ------------
+ src/blockdiag/tests/diagrams/testdata.rst | 12 ++++++++++++
+ src/blockdiag/tests/test_generate_diagram.py | 2 +-
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+ delete mode 100644 src/blockdiag/tests/diagrams/README
+ create mode 100644 src/blockdiag/tests/diagrams/testdata.rst
+
+diff --git a/src/blockdiag/tests/diagrams/README
b/src/blockdiag/tests/diagrams/README
+deleted file mode 100644
+index e0329be..0000000
+--- a/src/blockdiag/tests/diagrams/README
++++ /dev/null
@@ -1,12 +0,0 @@
-Copyrights of images
-=====================
@@ -18,23 +29,11 @@
-it is modified format::
-
- $ convert debian-logo-original.png -type PaletteAlpha -colors 256
-transparent #000000 debian-logo-256color-palettealpha.png
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_generate_diagram.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/test_generate_diagram.py
2021-01-31 23:34:47.910743408 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_generate_diagram.py
2021-01-31 23:34:47.906743409 +0900
-@@ -31,7 +31,7 @@
- def get_diagram_files(testdir):
- diagramsdir = os.path.join(testdir, 'diagrams')
-
-- skipped = ['README', 'debian-logo-256color-palettealpha.png',
-+ skipped = ['testdata.rst', 'debian-logo-256color-palettealpha.png',
- 'errors', 'white.gif']
- for file in os.listdir(diagramsdir):
- if file in skipped:
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/testdata.rst
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/diagrams/testdata.rst
2021-01-31 23:35:49.826740869 +0900
+diff --git a/src/blockdiag/tests/diagrams/testdata.rst
b/src/blockdiag/tests/diagrams/testdata.rst
+new file mode 100644
+index 0000000..e0329be
+--- /dev/null
++++ b/src/blockdiag/tests/diagrams/testdata.rst
@@ -0,0 +1,12 @@
+Copyrights of images
+=====================
@@ -48,3 +47,16 @@
+it is modified format::
+
+ $ convert debian-logo-original.png -type PaletteAlpha -colors 256
-transparent #000000 debian-logo-256color-palettealpha.png
+diff --git a/src/blockdiag/tests/test_generate_diagram.py
b/src/blockdiag/tests/test_generate_diagram.py
+index a721b10..d89c1bd 100644
+--- a/src/blockdiag/tests/test_generate_diagram.py
++++ b/src/blockdiag/tests/test_generate_diagram.py
+@@ -31,7 +31,7 @@ FONTPATH =
'/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf'
+ def get_diagram_files(testdir):
+ diagramsdir = os.path.join(testdir, 'diagrams')
+
+- skipped = ['README', 'debian-logo-256color-palettealpha.png',
++ skipped = ['testdata.rst', 'debian-logo-256color-palettealpha.png',
+ 'errors', 'white.gif']
+ for file in os.listdir(diagramsdir):
+ if file in skipped:
diff -Nru blockdiag-2.0.1+dfsg/debian/patches/series
blockdiag-2.0.1+dfsg/debian/patches/series
--- blockdiag-2.0.1+dfsg/debian/patches/series 2021-02-01 11:56:59.000000000
+0000
+++ blockdiag-2.0.1+dfsg/debian/patches/series 2023-10-19 03:03:49.000000000
+0100
@@ -6,3 +6,4 @@
remove-one-assert-in-test_node_attribute.patch
rename-test-data-file.patch
updates-egg-info.patch
+0009-Add-support-for-Pillow-10.patch
diff -Nru
blockdiag-2.0.1+dfsg/debian/patches/skip-test_app_cleans_up_images.patch
blockdiag-2.0.1+dfsg/debian/patches/skip-test_app_cleans_up_images.patch
--- blockdiag-2.0.1+dfsg/debian/patches/skip-test_app_cleans_up_images.patch
2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/skip-test_app_cleans_up_images.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,14 +1,18 @@
-Description: Skip test_app_cleans_up_images
(blockdiag.tests.test_command.TestBlockdiagApp)
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: Skip test_app_cleans_up_images
+ (blockdiag.tests.test_command.TestBlockdiagApp)
Not worki test why I removes remote image url on diagram.
So skips the test case.
-
-Author: Kouhei Maeda <mkou...@palmtb.net>
Last-Updated: 2021-01-31
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_command.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/test_command.py
2021-01-31 23:21:01.554777296 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_command.py 2021-01-31
23:21:16.054776701 +0900
+---
+ src/blockdiag/tests/test_command.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/blockdiag/tests/test_command.py
b/src/blockdiag/tests/test_command.py
+index f5e8e56..05269c8 100644
+--- a/src/blockdiag/tests/test_command.py
++++ b/src/blockdiag/tests/test_command.py
@@ -16,11 +16,13 @@
import os
import unittest
diff -Nru blockdiag-2.0.1+dfsg/debian/patches/updates-egg-info.patch
blockdiag-2.0.1+dfsg/debian/patches/updates-egg-info.patch
--- blockdiag-2.0.1+dfsg/debian/patches/updates-egg-info.patch 2021-02-01
11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/updates-egg-info.patch 2023-10-19
03:03:49.000000000 +0100
@@ -1,11 +1,18 @@
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: updates-egg-info
Descriptin: Removes Files-Excluded from SOURCES.txt and changes dependencies
order in requires.txt
-Author: Kouhei Maeda <mkou...@palmtb.net>
Last-Update: 2021-02-01
-Index: blockdiag-2.0.1+dfsg/src/blockdiag.egg-info/SOURCES.txt
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag.egg-info/SOURCES.txt
2021-02-01 17:14:49.919029297 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag.egg-info/SOURCES.txt 2021-02-01
17:16:15.471025789 +0900
-@@ -90,12 +90,6 @@
+
+---
+ src/blockdiag.egg-info/SOURCES.txt | 6 ------
+ src/blockdiag.egg-info/requires.txt | 8 ++++----
+ 2 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/blockdiag.egg-info/SOURCES.txt
b/src/blockdiag.egg-info/SOURCES.txt
+index e4f2ed0..4d75647 100644
+--- a/src/blockdiag.egg-info/SOURCES.txt
++++ b/src/blockdiag.egg-info/SOURCES.txt
+@@ -90,12 +90,6 @@ src/blockdiag/tests/test_parser.py
src/blockdiag/tests/test_utils.py
src/blockdiag/tests/test_utils_fontmap.py
src/blockdiag/tests/utils.py
@@ -18,10 +25,10 @@
src/blockdiag/tests/diagrams/auto_jumping_edge.diag
src/blockdiag/tests/diagrams/background_url_image.diag
src/blockdiag/tests/diagrams/beginpoint_color.diag
-Index: blockdiag-2.0.1+dfsg/src/blockdiag.egg-info/requires.txt
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag.egg-info/requires.txt
2021-02-01 17:14:49.919029297 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag.egg-info/requires.txt 2021-02-01
17:16:15.471025789 +0900
+diff --git a/src/blockdiag.egg-info/requires.txt
b/src/blockdiag.egg-info/requires.txt
+index ea82260..629fb5f 100644
+--- a/src/blockdiag.egg-info/requires.txt
++++ b/src/blockdiag.egg-info/requires.txt
@@ -1,6 +1,6 @@
-setuptools
-funcparserlib
@@ -31,7 +38,7 @@
webcolors
[pdf]
-@@ -10,10 +10,10 @@
+@@ -10,10 +10,10 @@ reportlab
docutils
[testing]
diff -Nru
blockdiag-2.0.1+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch
blockdiag-2.0.1+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch
--- blockdiag-2.0.1+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch
2021-02-01 11:56:59.000000000 +0000
+++ blockdiag-2.0.1+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch
2023-10-19 03:03:49.000000000 +0100
@@ -1,13 +1,16 @@
-Description: Use VLGothic font file on fullpath for testing.
-
-Author: Kouhei Maeda <mkou...@palmtb.net>
+From: Kouhei Maeda <mkou...@palmtb.net>
+Subject: Use VLGothic font file on fullpath for testing.
Forwarded: no
Last-Update: 2021-01-31
-Index: blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_generate_diagram.py
-===================================================================
---- blockdiag-2.0.1+dfsg.orig/src/blockdiag/tests/test_generate_diagram.py
2021-01-31 23:20:16.178779156 +0900
-+++ blockdiag-2.0.1+dfsg/src/blockdiag/tests/test_generate_diagram.py
2021-01-31 23:20:16.174779157 +0900
-@@ -25,12 +25,7 @@
+---
+ src/blockdiag/tests/test_generate_diagram.py | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/blockdiag/tests/test_generate_diagram.py
b/src/blockdiag/tests/test_generate_diagram.py
+index 361c86f..a721b10 100644
+--- a/src/blockdiag/tests/test_generate_diagram.py
++++ b/src/blockdiag/tests/test_generate_diagram.py
+@@ -25,12 +25,7 @@ import blockdiag.command
from blockdiag.tests.utils import (TemporaryDirectory, capture_stderr,
supported_pdf, supported_pil)
@@ -21,7 +24,7 @@
def get_diagram_files(testdir):
-@@ -68,8 +63,7 @@
+@@ -68,8 +63,7 @@ def test_generate_with_separate():
@nottest
def testcase_generator(basepath, mainfunc, files, options):
signature.asc
Description: PGP signature
![http://python.org/images/python-logo.gif"](http://python.org/images/python-logo.gif"){kind=link}