Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear release team, Please unblock blockdiag/1.5.3+dfsg-2. This would fixes #860689, #847930 in stretch and sid, which are some test failures on FTBFS. Attached is the source debdiff. Regards, diff -Nru blockdiag-1.5.3+dfsg/debian/changelog blockdiag-1.5.3+dfsg/debian/changelog --- blockdiag-1.5.3+dfsg/debian/changelog 2017-01-23 07:13:59.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/changelog 2017-05-26 22:06:40.000000000 +0900 @@ -1,3 +1,31 @@ +blockdiag (1.5.3+dfsg-2) unstable; urgency=medium + + * Fixes build kills unrelated python processes. Closes: #847930 + - debian/rules + * Removes PYBUILD_AFTER_BUILD,PYBUILD_{BEFORE,AFTER}_TEST options. + - debian/patches + * Adds use-vlgothic-package-on-fullpath.patch, + moves fontpath related modification + from Fixed-remote-image-resouces.patch + * Updates Fixed-remote-image-resouces.patch. + - debian/control + * Removes procps from Build-Depends. + * Fixes some test failures + - debian/patches + #* Removes 848748-exception-ignored-in-Image-del.patch unnecessary. + * Adds skip-test_app_cleans_up_images.patch. + * Adds fixes-test_node_attribute.patch. + * Adds fixes_test_fontmap_duplicated_fontentry1.patch. + * Fixes Missing Build-Depends on libmagickcore extra lib. Closes: #860689 + - debian/control + * Appends libmagickcore-6.q16-3-extra to Build-Depends. + * Bumps version debian/compat to 9. + - Fixes package-uses-deprecated-debhelper-compat-version. + * debian/control + - Appends python-configparser to Build-Depends. + + -- Kouhei Maeda <mkou...@palmtb.net> Fri, 26 May 2017 22:06:40 +0900 + blockdiag (1.5.3+dfsg-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru blockdiag-1.5.3+dfsg/debian/compat blockdiag-1.5.3+dfsg/debian/compat --- blockdiag-1.5.3+dfsg/debian/compat 2011-05-09 11:31:44.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/compat 2017-05-26 00:57:08.000000000 +0900 @@ -1 +1 @@ -7 +9 diff -Nru blockdiag-1.5.3+dfsg/debian/control blockdiag-1.5.3+dfsg/debian/control --- blockdiag-1.5.3+dfsg/debian/control 2016-10-11 10:15:43.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/control 2017-05-26 22:06:27.000000000 +0900 @@ -6,6 +6,7 @@ dh-python, python-all, python-setuptools, + python-configparser, python-unittest2, pep8 (>= 1.3), python-nose, @@ -17,7 +18,7 @@ python-reportlab, python-mock, python-wand, - python-pep8, + python-pep8, python3-all, python3-setuptools, python3-pep8 (>= 1.3), @@ -29,7 +30,7 @@ python3-reportlab, python3-mock, python3-wand, - procps, + libmagickcore-6.q16-3-extra, fonts-vlgothic | fonts-japanese-gothic Standards-Version: 3.9.8 X-Python-Version: 2.7 diff -Nru blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch --- blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch 2017-01-23 07:13:59.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/848748-exception-ignored-in-Image-del.patch 2017-05-26 01:18:57.000000000 +0900 @@ -18,9 +18,11 @@ Bug-Debian: https://bugs.debian.org/848748 Forwarded: no ---- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/utils.py -+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py -@@ -64,7 +64,14 @@ def capture_stderr(func): +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/utils.py 2017-05-25 23:32:58.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/utils.py 2017-05-26 01:18:55.308523308 +0900 +@@ -64,7 +64,14 @@ func(*args, **kwargs) diff -Nru blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch --- blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch 2016-10-11 10:01:17.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/Fixed-remote-image-resouces.patch 2017-05-25 23:30:39.000000000 +0900 @@ -1,66 +1,30 @@ -Description: Fixed remote image resouce for testing data. +Description: Changes remote image resource to local files from base packages. Author: Kouhei Maeda <mkou...@palmtb.net> -Last-Update: 2014-08-30 +Last-Update: 2017-05-25 Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag =================================================================== ---- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2016-10-11 09:34:17.160842131 +0900 -+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag 2016-10-11 09:52:51.272842131 +0900 -@@ -1,7 +1,7 @@ +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2017-05-25 23:00:55.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag 2017-05-25 23:27:40.577680607 +0900 +@@ -1,7 +1,6 @@ { - A [background = "http://python.org/images/python-logo.gif"]; - B [background = "http://blockdiag.com/favicon.ico"]; - C [background = "http://upload.wikimedia.org/wikipedia/commons/9/9b/Scalable_Vector_Graphics_Circle2.svg"]; - D [background = "http://people.sc.fsu.edu/~jburkardt/data/eps/circle.eps"]; -+ A [background = "src/blockdiag/tests/diagrams/white.gif"]; -+ B [background = "src/blockdiag/tests/diagrams/white.gif"]; -+ C [background = "http://localhost:8000/circle.svg"]; -+ D [background = "http://localhost:8000/circle.eps"]; ++ A [background = "/usr/lib/python3.5/idlelib/Icons/python.gif"]; ++ B [background = "/usr/lib/python3.5/idlelib/Icons/idle.ico"]; ++ C [background = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"]; Z; } Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag =================================================================== ---- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/node_icon.diag 2016-10-11 09:34:17.160842131 +0900 -+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag 2016-10-11 09:34:17.156842131 +0900 +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/node_icon.diag 2017-05-25 23:00:55.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag 2017-05-25 23:28:43.233680607 +0900 @@ -2,5 +2,5 @@ A -> B; A [label = "aaaaaaaaaaaaaaaaa", icon = "/usr/share/pixmaps/debian-logo.png"]; - B [label = "aaaaaaaaaaaaaaaaa", icon = "http://blockdiag.com/favicon.ico"]; -+ B [label = "aaaaaaaaaaaaaaaaa", icon = "/usr/share/pixmaps/debian-logo.png"]; ++ B [label = "aaaaaaaaaaaaaaaaa", icon = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"]; } -Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_generate_diagram.py -=================================================================== ---- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_generate_diagram.py 2015-02-21 18:40:48.000000000 +0900 -+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_generate_diagram.py 2016-10-11 10:01:15.876842131 +0900 -@@ -16,11 +16,7 @@ - - - TESTDIR = os.path.dirname(__file__) --FONTPATH = os.path.join(TESTDIR, 'VLGothic', 'VL-Gothic-Regular.ttf') -- -- --def get_fontpath(testdir): -- return os.path.join(testdir, 'VLGothic', 'VL-Gothic-Regular.ttf') -+FONTPATH = '/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf' - - - def get_diagram_files(testdir): -@@ -58,7 +54,7 @@ - - @nottest - def testcase_generator(basepath, mainfunc, files, options): -- fontpath = get_fontpath(basepath) -+ fontpath = FONTPATH - options = options + ['-f', fontpath] - - for source in files: -@@ -139,7 +135,7 @@ - - args = ['-T', 'SVG', '-o', tmpfile, diagpath] - ret = blockdiag.command.main(args) -- assert 'Could not convert image:' in sys.stderr.getvalue() -+ assert 'Fail to convert' in sys.stderr.getvalue() - assert ret == 0 - finally: - tmpdir.clean() diff -Nru blockdiag-1.5.3+dfsg/debian/patches/compat-pep8-1.5.7_1.6.x.patch blockdiag-1.5.3+dfsg/debian/patches/compat-pep8-1.5.7_1.6.x.patch --- blockdiag-1.5.3+dfsg/debian/patches/compat-pep8-1.5.7_1.6.x.patch 2015-10-27 16:35:38.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/compat-pep8-1.5.7_1.6.x.patch 1970-01-01 09:00:00.000000000 +0900 @@ -1,23 +0,0 @@ -Description: Resolve compatibility problems with the version of the difference of pep8 -Author: Kouhei Maeda <mkou...@palmtb.net> -Last-Update: 2015-10-27 -Index: blockdiag-1.4.7/src/blockdiag/tests/test_pep8.py -=================================================================== ---- blockdiag-1.4.7.orig/src/blockdiag/tests/test_pep8.py 2015-10-27 16:13:43.000000000 +0900 -+++ blockdiag-1.4.7/src/blockdiag/tests/test_pep8.py 2015-10-27 16:24:08.479706970 +0900 -@@ -15,7 +15,7 @@ - ['repeat', True], - ['paths', [BASE_DIR]]] - -- pep8style = pep8.StyleGuide(arglist, parse_argv=False, config_file=True) -+ pep8style = pep8.StyleGuide(arglist, parse_argv=False) - options = pep8style.options - if options.doctest: - import doctest -Index: blockdiag-1.4.7/.pep8 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ blockdiag-1.4.7/.pep8 2015-10-27 16:24:08.479706970 +0900 -@@ -0,0 +1,2 @@ -+[pep8] -+ignore = E241,E402,E731,W503 diff -Nru blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch --- blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch 1970-01-01 09:00:00.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/fixes-ghostscript_not_found_test.patch 2017-05-26 01:16:32.000000000 +0900 @@ -0,0 +1,18 @@ +Description: Fixes ghostscript_not_found_test. + +Appends PYBUILD_BEFORE_BUILD on debian/rules. + +Author: Kouhei Maeda <mkou...@palmtb.net> +Last-Update: 2017-05-26 +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2017-05-26 00:53:25.852523308 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag 2017-05-26 01:16:29.640523308 +0900 +@@ -2,5 +2,7 @@ + A [background = "/usr/lib/python3.5/idlelib/Icons/python.gif"]; + B [background = "/usr/lib/python3.5/idlelib/Icons/idle.ico"]; + C [background = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"]; ++ D [background = "/tmp/circle.eps"]; ++ E [background = "/tmp/circle.svg"]; + Z; + } diff -Nru blockdiag-1.5.3+dfsg/debian/patches/fixes-test_node_attribute.patch blockdiag-1.5.3+dfsg/debian/patches/fixes-test_node_attribute.patch --- blockdiag-1.5.3+dfsg/debian/patches/fixes-test_node_attribute.patch 1970-01-01 09:00:00.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/fixes-test_node_attribute.patch 2017-05-25 23:49:27.000000000 +0900 @@ -0,0 +1,30 @@ +Description: Fixes test_node_attribute (blockdiag.tests.test_builder_node.TestBuilderNode). +Author: Kouhei Maeda <mkou...@palmtb.net> +Last-Update: 2017-05-25 + +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_builder_node.py +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_builder_node.py 2014-07-12 20:23:53.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_builder_node.py 2017-05-25 23:44:25.925680607 +0900 +@@ -83,8 +83,8 @@ + orientations = defaultdict(lambda: 'horizontal') + orientations['J'] = 'vertical' + backgrounds = defaultdict(lambda: None) +- backgrounds['K'] = ('src/blockdiag/tests/diagrams/' +- 'debian-logo-256color-palettealpha.png') ++ backgrounds['K'] = '/usr/lib/python3.5/idlelib/Icons/idle_16.png' ++ + + diagram = self.build('node_attribute.diag') + self.assertNodeLabel(diagram, labels) +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_attribute.diag +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/diagrams/node_attribute.diag 2014-07-12 20:23:53.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_attribute.diag 2017-05-25 23:47:06.229680607 +0900 +@@ -9,5 +9,5 @@ + H [fontsize = 16]; + I [linecolor = red]; + J [label="Hello", label_orientation=vertical]; +- K [background = "src/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png"]; ++ K [background = "/usr/lib/python3.5/idlelib/Icons/idle_16.png"]; + } diff -Nru blockdiag-1.5.3+dfsg/debian/patches/fixes_test_fontmap_duplicated_fontentry1.patch blockdiag-1.5.3+dfsg/debian/patches/fixes_test_fontmap_duplicated_fontentry1.patch --- blockdiag-1.5.3+dfsg/debian/patches/fixes_test_fontmap_duplicated_fontentry1.patch 1970-01-01 09:00:00.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/fixes_test_fontmap_duplicated_fontentry1.patch 2017-05-26 00:35:27.000000000 +0900 @@ -0,0 +1,37 @@ +Description: Fixes test_fontmap_duplicated_fontentry1 + +Deprecated specificatoin for Python 2 at test_fontmap_duplicated_fontentry1. +Author: Kouhei Maeda <mkou...@palmtb.net> +Last-Update: 2017-05-26 +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_utils_fontmap.py +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_utils_fontmap.py 2015-02-21 18:38:44.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_utils_fontmap.py 2017-05-26 00:32:40.736523308 +0900 +@@ -3,6 +3,7 @@ + import os + import sys + import tempfile ++import configparser + from io import StringIO + from collections import namedtuple + from blockdiag.utils.compat import u +@@ -210,17 +211,8 @@ + _config = u("[fontmap]\nsansserif: %s\nsansserif: %s\n") % \ + (self.fontpath[0], self.fontpath[1]) + config = StringIO(_config) +- if sys.version_info[0] == 2: +- fmap = FontMap(config) +- +- font1 = fmap.find() +- self.assertEqual('sans-serif', font1.generic_family) +- self.assertEqual(self.fontpath[1], font1.path) +- self.assertEqual(11, font1.size) +- else: +- import configparser +- with self.assertRaises(configparser.DuplicateOptionError): +- FontMap(config) ++ with self.assertRaises(configparser.DuplicateOptionError): ++ FontMap(config) + + def test_fontmap_duplicated_fontentry2(self): + # this testcase is only for python2.6 or later diff -Nru blockdiag-1.5.3+dfsg/debian/patches/series blockdiag-1.5.3+dfsg/debian/patches/series --- blockdiag-1.5.3+dfsg/debian/patches/series 2017-01-23 07:13:59.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/series 2017-05-26 01:17:56.000000000 +0900 @@ -1,2 +1,7 @@ Fixed-remote-image-resouces.patch +use-vlgothic-package-on-fullpath.patch +skip-test_app_cleans_up_images.patch +fixes-test_node_attribute.patch +fixes_test_fontmap_duplicated_fontentry1.patch +fixes-ghostscript_not_found_test.patch 848748-exception-ignored-in-Image-del.patch diff -Nru blockdiag-1.5.3+dfsg/debian/patches/skip-test_app_cleans_up_images.patch blockdiag-1.5.3+dfsg/debian/patches/skip-test_app_cleans_up_images.patch --- blockdiag-1.5.3+dfsg/debian/patches/skip-test_app_cleans_up_images.patch 1970-01-01 09:00:00.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/skip-test_app_cleans_up_images.patch 2017-05-25 23:40:44.000000000 +0900 @@ -0,0 +1,27 @@ +Description: 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: 2017-05-25 +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_command.py +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_command.py 2015-02-21 18:41:26.000000000 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_command.py 2017-05-25 23:40:26.477680607 +0900 +@@ -2,6 +2,7 @@ + + import os + import sys ++from nose.tools import nottest + from blockdiag.command import BlockdiagApp + from blockdiag.tests.utils import TemporaryDirectory + +@@ -12,6 +13,7 @@ + + + class TestBlockdiagApp(unittest.TestCase): ++ @nottest + def test_app_cleans_up_images(self): + testdir = os.path.dirname(__file__) + diagpath = os.path.join(testdir, diff -Nru blockdiag-1.5.3+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch blockdiag-1.5.3+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch --- blockdiag-1.5.3+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch 1970-01-01 09:00:00.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/patches/use-vlgothic-package-on-fullpath.patch 2017-05-25 22:54:44.000000000 +0900 @@ -0,0 +1,33 @@ +Description: Use VLGothic font file on fullpath for testing. + +Author: Kouhei Maeda <mkou...@palmtb.net> +Forwarded: no +Last-Update: 2017-05-25 +Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_generate_diagram.py +=================================================================== +--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_generate_diagram.py 2017-05-25 22:47:47.057680607 +0900 ++++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_generate_diagram.py 2017-05-25 22:54:24.021680607 +0900 +@@ -15,12 +15,7 @@ + import unittest + + +-TESTDIR = os.path.dirname(__file__) +-FONTPATH = os.path.join(TESTDIR, 'VLGothic', 'VL-Gothic-Regular.ttf') +- +- +-def get_fontpath(testdir): +- return os.path.join(testdir, 'VLGothic', 'VL-Gothic-Regular.ttf') ++FONTPATH = '/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf' + + + def get_diagram_files(testdir): +@@ -58,8 +53,7 @@ + + @nottest + def testcase_generator(basepath, mainfunc, files, options): +- fontpath = get_fontpath(basepath) +- options = options + ['-f', fontpath] ++ options = options + ['-f', FONTPATH] + + for source in files: + yield generate, mainfunc, 'svg', source, options diff -Nru blockdiag-1.5.3+dfsg/debian/rules blockdiag-1.5.3+dfsg/debian/rules --- blockdiag-1.5.3+dfsg/debian/rules 2016-10-11 09:59:54.000000000 +0900 +++ blockdiag-1.5.3+dfsg/debian/rules 2017-05-26 21:58:39.000000000 +0900 @@ -1,13 +1,10 @@ #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 export PYBUILD_NAME=blockdiag -export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info {build_dir} -export PYBUILD_AFTER_BUILD=install -d {build_dir}/src; rm -rf {build_dir}/blockdiag -export PYBUILD_BEFORE_TEST=pkill python;cp -a $(CURDIR)/src/blockdiag {build_dir}/src/; cd $(CURDIR)/debian; python -m SimpleHTTPServer & -export PYBUILD_AFTER_TEST=rm -rf {build_dir}/src;pkill python +export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info {build_dir};cp -f $(CURDIR)/debian/circle.* /tmp/ %: dh $@ --with python2,python3 --buildsystem=pybuild