[blockdiag] 28/29: Import Debian patch 1.5.3+dfsg-1
Andreas Tille
tille at debian.org
Tue Jan 10 21:36:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository blockdiag.
commit b5757e03e75bf68a1a97072a722b25825dd5d6ca
Merge: b96c871 1e929f7
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Tue Oct 11 10:21:04 2016 +0900
Import Debian patch 1.5.3+dfsg-1
.hgignore | 14 ++
.hgtags | 110 +++++++++++
.installed.cfg | 62 +++++++
CHANGES.rst | 31 ++++
MANIFEST.in | 1 +
PKG-INFO | 2 +-
a.diag | 6 +
b.diag | 8 +
b.png | Bin 0 -> 7778 bytes
blockdiag.svg | 46 +++++
bootstrap.pyc | Bin 0 -> 4410 bytes
c.diag | 3 +
debian/changelog | 23 +++
debian/circle.eps | 202 +++++++++++++++++++++
debian/circle.svg | 5 +
debian/control | 5 +-
debian/copyright | 2 +
debian/patches/Fixed-remote-image-resouces.patch | 56 +++++-
debian/patches/series | 1 -
debian/rules | 4 +-
debian/watch | 2 +-
e.diag | 5 +
setup.py | 9 +-
src/blockdiag.egg-info/PKG-INFO | 2 +-
src/blockdiag.egg-info/SOURCES.txt | 18 +-
src/blockdiag.egg-info/requires.txt | 2 +-
src/blockdiag/__init__.py | 2 +-
src/blockdiag/imagedraw/filters/linejump.py | 56 +++---
src/blockdiag/imagedraw/svg.py | 7 +-
src/blockdiag/plugins/__init__.py | 25 ++-
src/blockdiag/tests/__init__.py | 1 +
src/blockdiag/tests/rst/__init__.py | 1 +
src/blockdiag/tests/rst/test_base_directives.py | 17 +-
.../tests/rst/test_blockdiag_directives.py | 30 ++-
src/blockdiag/tests/test_boot_params.py | 23 +--
src/blockdiag/tests/test_command.py | 67 +++++++
src/blockdiag/tests/test_generate_diagram.py | 70 ++++---
src/blockdiag/tests/test_imagedraw_textfolder.py | 10 +-
src/blockdiag/tests/test_imagedraw_utils.py | 10 +-
src/blockdiag/tests/test_parser.py | 6 +-
src/blockdiag/tests/test_pep8.py | 53 ------
src/blockdiag/tests/test_utils.py | 10 +-
src/blockdiag/tests/test_utils_fontmap.py | 41 ++---
src/blockdiag/tests/utils.py | 12 +-
src/blockdiag/utils/__init__.py | 13 +-
src/blockdiag/utils/bootstrap.py | 31 +++-
src/blockdiag/utils/compat.py | 2 +-
src/blockdiag/utils/fontmap.py | 16 +-
src/blockdiag/utils/images.py | 52 ++++--
src/blockdiag/utils/rst/directives.py | 13 +-
src/blockdiag_sphinxhelper.py | 11 +-
test.sh | 4 +
tox.ini | 20 +-
53 files changed, 983 insertions(+), 239 deletions(-)
diff --cc debian/changelog
index 202b6ce,0000000..4cb81cc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,166 -1,0 +1,189 @@@
++blockdiag (1.5.3+dfsg-1) unstable; urgency=medium
++
++ * New upstream release. Closes: #801314
++ * debian/copyright
++ - Appends Files-Excluded section.
++ * debian/watch
++ - Changed to use dversionmangle instead of uversionmangle.
++ * debian/control
++ - Standards-Version: Bump version to 3.9.8.
++ - Build-Depends:
++ * Changes fonts-vlgothic instead of fonts-ipafont-gothic.
++ * Appends procps.
++ * debian/patches
++ - Deleted compat-pep8-1.5.7_1.6.x.patch.
++ - Updated Fixed-remote-image-resouces.patch.
++ * debian/rules
++ - Updated PYBUILD_BEFORE_TEST, PYBUILD_AFTER_TEST.
++ * Adds test data
++ - debian/circle.svg
++ - debian/circle.eps
++
++ -- Kouhei Maeda <mkouhei at palmtb.net> Tue, 11 Oct 2016 10:21:04 +0900
++
+blockdiag (1.4.7-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * added a dependency on python-pep8. Closes: #817789
+
+ -- Georges Khaznadar <georgesk at debian.org> Fri, 18 Mar 2016 18:17:54 +0100
+
+blockdiag (1.4.7-2) unstable; urgency=medium
+
+ * Fixes FTBFS: unknown format: SVG (Closes: #796371)
+ - debian/rules
+ * Adds PYBUILD_{BEFORE,AFTER}_{BUILD,TEST},
+ Thanks Piotr Ożarowski <piotr at debian.org>.
+ - debian/patches
+ * Adds compat-pep8-1.5.7_1.6.x.patch.
+ * debian/watch
+ - Fixes debian-watch-file-unsupported-pypi-url
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Tue, 27 Oct 2015 16:41:46 +0900
+
+blockdiag (1.4.7-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sat, 25 Oct 2014 21:28:57 +0900
+
+blockdiag (1.4.6-2) unstable; urgency=medium
+
+ * debian/watch
+ - Fixed uri scheme http:// to https://.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Thu, 16 Oct 2014 22:00:08 +0900
+
+blockdiag (1.4.6-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/control
+ - Removed Provides from python3-blockdiag.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Wed, 15 Oct 2014 07:51:10 +0900
+
+blockdiag (1.4.5-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/control
+ - Standards-Version: Bump version to 3.9.6.
+ * debian/copyright
+ - Rename src/blogdiag/diagparser.py to src/blockdiag/parser.py.
+ - Fixed space-in-std-shortname-in-dep5-copyright.
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Mon, 13 Oct 2014 14:13:26 +0900
+
+blockdiag (1.4.3-1) unstable; urgency=medium
+
+ * New upstream release
+ - Fixed FTBFS blockdiag.tests.test_pep8.test_pep8 (Closes: #759889)
+ * Supported Python 3
+ - Appended python3-blockdiag package
+ * debian/control
+ - Build-Depends
+ * Removed: quilt
+ * Appended: dh-python, python3-all, python3-setuptools, python3-pep8,
+ python3-nose, python3-funcparserlib, python3-docutils, python3-pil,
+ python3-webcolors, python3-reportlab, python3-mock, python3-wand,
+ python-mock, python-wand
+ - Standards-Version: Bump version to 3.9.5
+ * debian/rules
+ - Applied pybuild
+ - Appended targets:
+ override_dh_python3, convert_manpage_blockdiag3
+ * debian/patches
+ - Removed update_egg-info.patch
+ - Added Fixed-remote-image-resouces.patch
+ * debian/pydist-overrides removed
+ * Added debian/python-blockdiag.links, debian/python3-blockdiag.links
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Mon, 01 Sep 2014 07:59:05 +0900
+
+blockdiag (1.3.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control
+ - Change dependenry python-imaging to python-pil
+ - Append quilt to "Build-Depends"
+ - Append python-webcolors to "Depends"
+ * debian/docs
+ - Rename src/README.txt to README.rst
+ - Remove src/TODO.txt
+ * debian/copyright
+ - Change "Format" section to latest url
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sat, 23 Nov 2013 08:10:04 +0900
+
+blockdiag (1.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches
+ - Has been deleted because it was no longer needed.
+ - update_egg-info, fix-pep8-violations, pep8-1.3.patch
+ * debian/control
+ - Update Standards-Version to 3.9.4
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Mon, 10 Jun 2013 16:35:38 +0900
+
+blockdiag (1.1.6-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/pep8-1.3.patch: Backport patch from upstream to port to new
+ pep8 API. (Closes: #707119)
+ * debian/control: Bump Build-Depends on pep8 to >= 1.3.
+
+ -- Sebastian Ramacher <sramacher at debian.org> Sat, 18 May 2013 10:11:41 +0200
+
+blockdiag (1.1.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix PEP8 violations with a patch from upstream (31961dd5ba9b).
+ Closes: #681328
+
+ -- Evgeni Golov <evgeni at debian.org> Wed, 18 Jul 2012 21:16:06 +0200
+
+blockdiag (1.1.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sat, 09 Jun 2012 16:32:09 +0900
+
+blockdiag (1.1.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Tue, 24 Apr 2012 02:33:02 +0900
+
+blockdiag (1.1.4-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control
+ - Update debhelper version
+ - Add python-unittest2, pep8, python-nose, python-docutils,
+ python-reportlab, python-zc.buildout,
+ python-funcparserlib, (fonts-ipafont-gothic|fonts-japanese gothic)
+ to Build-Depends field
+ - Add python-docutils, python-reportlab to Depends field
+ * debian/rules
+ - Add override_dh_auto_test with nosetests
+ * src/blockdiag/utils/bootstrap.py
+ - Add quilt new fontdetect, change ipagp.ttf path to glob pattern
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Tue, 17 Apr 2012 08:39:10 +0900
+
+blockdiag (1.1.2-2) unstable; urgency=low
+
+ * debian/control
+ - Update Homepage field
+ - Update extended description of Description field
+ * quilt header
+ - Add header of "update_egg-info"
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sun, 12 Feb 2012 21:53:57 +0900
+
+blockdiag (1.1.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #626707)
+ * Update egg-info
+
+ -- Kouhei Maeda <mkouhei at palmtb.net> Sun, 08 Jan 2012 18:29:25 +0900
diff --cc debian/circle.eps
index 0000000,0000000..a8d568a
new file mode 100644
--- /dev/null
+++ b/debian/circle.eps
@@@ -1,0 -1,0 +1,202 @@@
++%!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 --cc debian/circle.svg
index 0000000,0000000..cec93cf
new file mode 100644
--- /dev/null
+++ b/debian/circle.svg
@@@ -1,0 -1,0 +1,5 @@@
++<?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 --cc debian/control
index bb9407f,0000000..8dbf30f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,63 -1,0 +1,64 @@@
+Source: blockdiag
+Section: python
+Priority: optional
+Maintainer: Kouhei Maeda <mkouhei at palmtb.net>
+Build-Depends: debhelper (>= 8.0.0),
+ dh-python,
+ python-all,
+ python-setuptools,
+ python-unittest2,
+ pep8 (>= 1.3),
+ python-nose,
+ python-zc.buildout,
+ python-funcparserlib (>= 0.3.4),
+ python-docutils,
+ python-pil,
+ python-webcolors,
+ python-reportlab,
+ python-mock,
+ python-wand,
+ python-pep8,
+ python3-all,
+ python3-setuptools,
+ python3-pep8 (>= 1.3),
+ python3-nose,
+ python3-funcparserlib (>= 0.3.4),
+ python3-docutils,
+ python3-pil,
+ python3-webcolors,
+ python3-reportlab,
+ python3-mock,
+ python3-wand,
- fonts-ipafont-gothic | fonts-japanese-gothic
- Standards-Version: 3.9.6
++ procps,
++ fonts-vlgothic | fonts-japanese-gothic
++Standards-Version: 3.9.8
+X-Python-Version: 2.7
+Homepage: http://blockdiag.com/
+
+Package: python-blockdiag
+Architecture: all
+Provides: ${python:Provides}
+Depends: ${misc:Depends}, ${python:Depends},
+ python-funcparserlib (>= 0.3.4),
+ python-pil,
+ python-docutils,
+ python-reportlab,
+ python-webcolors
+Description: generate block-diagram image file from spec-text file
+ 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
+ using python-sphinxcontrib-blockdiag.
+
+Package: python3-blockdiag
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends},
+ python3-funcparserlib (>= 0.3.4),
+ python3-pil,
+ python3-docutils,
+ python3-reportlab,
+ python3-webcolors
+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
+ using python-sphinxcontrib-blockdiag.
diff --cc debian/copyright
index 16ce6c0,0000000..cf0dafc
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,63 -1,0 +1,65 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: blockdiag
+Source: http://pypi.python.org/pypi/blockdiag/
++Files-Excluded:
++ src/blockdiag/tests/VLGothic/*
+
+Files: *
+Copyright: 2010, 2011 Takeshi Komiya <i.tkomiya at gmail.com>
+License: Apache-2
+
+Files: src/blockdiag/parser.py
+Copyright: 2008,2009 Andrey Vlasovskikh
+License: Expat
+
+Files: bootstrap.py
+Copyright: 2006 Zope Foundation and Contributors
+License: Zope-2.1
+
+Files: debian/*
+Copyright: 2011 Kouhei Maeda <mkouhei at palmtb.net>
+License: Apache-2
+
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: Zope-2.1
+ This software is subject to the provisions of the Zope Public License,
+ Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+ WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+ FOR A PARTICULAR PURPOSE.
diff --cc debian/patches/Fixed-remote-image-resouces.patch
index 065bf49,0000000..610f84f
mode 100644,000000..100644
--- a/debian/patches/Fixed-remote-image-resouces.patch
+++ b/debian/patches/Fixed-remote-image-resouces.patch
@@@ -1,28 -1,0 +1,66 @@@
+Description: Fixed remote image resouce for testing data.
+Author: Kouhei Maeda <mkouhei at palmtb.net>
+Last-Update: 2014-08-30
+
- Index: blockdiag-1.4.7/src/blockdiag/tests/diagrams/background_url_image.diag
++Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/background_url_image.diag
+===================================================================
- --- blockdiag-1.4.7.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-25 21:29:03.154327535 +0900
- +++ blockdiag-1.4.7/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-25 21:29:03.154327535 +0900
- @@ -1,6 +1,6 @@
++--- 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 @@
+ {
+- 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://upload.wikimedia.org/wikipedia/commons/9/9b/Scalable_Vector_Graphics_Circle2.svg"];
- D [background = "http://people.sc.fsu.edu/~jburkardt/data/eps/circle.eps"];
+++ C [background = "http://localhost:8000/circle.svg"];
+++ D [background = "http://localhost:8000/circle.eps"];
+ Z;
- Index: blockdiag-1.4.7/src/blockdiag/tests/diagrams/node_icon.diag
++ }
++Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/diagrams/node_icon.diag
+===================================================================
- --- blockdiag-1.4.7.orig/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-25 21:29:03.154327535 +0900
- +++ blockdiag-1.4.7/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-25 21:29:03.154327535 +0900
++--- 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
+@@ -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"];
+ }
++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 --cc debian/patches/series
index cb94fb8,0000000..df0e3dc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+Fixed-remote-image-resouces.patch
- compat-pep8-1.5.7_1.6.x.patch
diff --cc debian/rules
index 798dbf7,0000000..cfd01f3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,30 -1,0 +1,30 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#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=cp -a $(CURDIR)/src/blockdiag {build_dir}/src/
- export PYBUILD_AFTER_TEST=rm -rf {build_dir}/src
++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
+
+%:
+ dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_python2:
+ dh_python2
+ install -d $(CURDIR)/debian/python-blockdiag/usr/share/doc/python-blockdiag/testimages
+ mv -f $(CURDIR)/debian/python-blockdiag/usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png $(CURDIR)/debian/python-blockdiag/usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/white.gif $(CURDIR)/debian/python-blockdiag/usr/share/doc/python-blockdiag/testimages/
+
+override_dh_python3:
+ dh_python3 --shebang=/usr/bin/python3
+ mv -f $(CURDIR)/debian/python3-blockdiag/usr/bin/blockdiag $(CURDIR)/debian/python3-blockdiag/usr/bin/blockdiag3
+ install -d $(CURDIR)/debian/python3-blockdiag/usr/share/doc/python3-blockdiag/testimages
+ mv -f $(CURDIR)/debian/python3-blockdiag/usr/lib/python3/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png $(CURDIR)/debian/python3-blockdiag/usr/lib/python3/dist-packages/blockdiag/tests/diagrams/white.gif $(CURDIR)/debian/python3-blockdiag/usr/share/doc/python3-blockdiag/testimages/
+
+convert_manpage_blockdiag3:
+ sed 's/^blockdiag \\/blockdiag3 \\/' $(CURDIR)/blockdiag.1 > $(CURDIR)/debian/blockdiag3.1
+ sed -i 's/^.B blockdiag/.B blockdiag3/g' $(CURDIR)/debian/blockdiag3.1
+ sed -i 's/^.TH BLOCKDIAG /.TH BLOCKDIAG3 /' $(CURDIR)/debian/blockdiag3.1
+ sed -i 's/^\\fBblockdiag/\\fBblockdiag3/' $(CURDIR)/debian/blockdiag3.1
diff --cc debian/watch
index c595c76,0000000..a7751e3
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
- opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
++opts=dversionmangle=s/\+dfsg// \
+http://pypi.debian.net/blockdiag/blockdiag-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/blockdiag.git
More information about the debian-science-commits
mailing list