[blockdiag] 17/29: Import Debian patch 1.4.3-1
Andreas Tille
tille at debian.org
Tue Jan 10 21:35:58 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 d626fadcfb53f378c21eb6211c85bf383dfa3f0e
Merge: 48c4668 b42615b
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Mon Sep 1 07:59:05 2014 +0900
Import Debian patch 1.4.3-1
MANIFEST.in | 5 +-
PKG-INFO | 98 +++-
README.rst | 94 +++-
buildout.cfg | 10 +-
debian/blockdiag3.1 | 78 +++
debian/changelog | 26 +
debian/control | 52 +-
debian/patches/Fixed-remote-image-resouces.patch | 24 +
debian/patches/series | 2 +-
debian/pydist-overrides | 4 -
debian/python-blockdiag.links | 2 +
debian/{manpages => python-blockdiag.manpages} | 0
debian/python3-blockdiag.links | 2 +
debian/python3-blockdiag.manpages | 1 +
debian/rules | 26 +-
setup.cfg | 10 +
setup.py | 16 +-
src/blockdiag.egg-info/PKG-INFO | 98 +++-
src/blockdiag.egg-info/SOURCES.txt | 12 +-
src/blockdiag.egg-info/requires.txt | 13 +-
src/blockdiag/__init__.py | 2 +-
src/blockdiag/builder.py | 2 +-
src/blockdiag/drawer.py | 3 +-
src/blockdiag/elements.py | 71 +--
src/blockdiag/imagedraw/__init__.py | 10 +-
src/blockdiag/imagedraw/base.py | 2 -
src/blockdiag/imagedraw/pdf.py | 38 +-
src/blockdiag/imagedraw/png.py | 82 ++-
src/blockdiag/imagedraw/simplesvg.py | 5 +-
src/blockdiag/imagedraw/svg.py | 31 +-
src/blockdiag/imagedraw/utils/__init__.py | 19 +-
.../none.py => imagedraw/utils/pillow.py} | 27 +-
src/blockdiag/metrics.py | 9 +-
src/blockdiag/noderenderer/__init__.py | 120 +----
src/blockdiag/noderenderer/actor.py | 30 +-
.../noderenderer/{__init__.py => base.py} | 35 +-
src/blockdiag/noderenderer/beginpoint.py | 2 +-
src/blockdiag/noderenderer/box.py | 2 +-
src/blockdiag/noderenderer/circle.py | 19 +-
src/blockdiag/noderenderer/cloud.py | 2 +-
src/blockdiag/noderenderer/diamond.py | 2 +-
src/blockdiag/noderenderer/dots.py | 2 +-
src/blockdiag/noderenderer/ellipse.py | 2 +-
src/blockdiag/noderenderer/endpoint.py | 2 +-
src/blockdiag/noderenderer/flowchart/database.py | 2 +-
src/blockdiag/noderenderer/flowchart/input.py | 2 +-
src/blockdiag/noderenderer/flowchart/loopin.py | 2 +-
src/blockdiag/noderenderer/flowchart/loopout.py | 2 +-
src/blockdiag/noderenderer/flowchart/terminator.py | 2 +-
src/blockdiag/noderenderer/mail.py | 2 +-
src/blockdiag/noderenderer/minidiamond.py | 2 +-
src/blockdiag/noderenderer/none.py | 2 +-
src/blockdiag/noderenderer/note.py | 2 +-
src/blockdiag/noderenderer/roundedbox.py | 2 +-
src/blockdiag/noderenderer/square.py | 16 +-
src/blockdiag/noderenderer/textbox.py | 2 +-
src/blockdiag/parser.py | 10 +-
src/blockdiag/plugins/__init__.py | 29 +-
src/blockdiag/plugins/autoclass.py | 4 +-
src/blockdiag/tests/diagrams/README | 12 +
.../tests/diagrams/background_url_image.diag | 4 +-
.../diagrams/debian-logo-256color-palettealpha.png | Bin 0 -> 474 bytes
.../tests/diagrams/diagram_attributes.diag | 1 +
.../diagrams/errors/unknown_diagram_type.diag | 3 +
src/blockdiag/tests/diagrams/node_attribute.diag | 1 +
src/blockdiag/tests/diagrams/node_icon.diag | 2 +-
src/blockdiag/tests/rst/__init__.py | 0
src/blockdiag/tests/rst/test_base_directives.py | 129 +++++
.../test_blockdiag_directives.py} | 550 +++++++++++++++------
src/blockdiag/tests/test_boot_params.py | 7 +-
src/blockdiag/tests/test_builder.py | 1 +
src/blockdiag/tests/test_builder_errors.py | 5 +
src/blockdiag/tests/test_builder_node.py | 10 +-
src/blockdiag/tests/test_generate_diagram.py | 17 +-
src/blockdiag/tests/test_pep8.py | 2 +-
src/blockdiag/tests/test_utils.py | 40 ++
src/blockdiag/tests/test_utils_fontmap.py | 18 +-
src/blockdiag/tests/utils.py | 8 +-
src/blockdiag/utils/__init__.py | 38 +-
src/blockdiag/utils/bootstrap.py | 19 +-
src/blockdiag/utils/compat.py | 2 +
src/blockdiag/utils/fontmap.py | 11 +-
src/blockdiag/utils/images.py | 131 +++--
src/blockdiag/utils/jpeg.py | 92 ----
src/blockdiag/utils/{rst/nodes.py => logging.py} | 15 +-
src/blockdiag/utils/rst/directives.py | 203 +++++---
src/blockdiag/utils/rst/nodes.py | 36 +-
src/blockdiag/utils/urlutil.py | 13 +
tox.ini | 10 +-
89 files changed, 1691 insertions(+), 862 deletions(-)
diff --cc debian/blockdiag3.1
index 0000000,0000000..6530fc3
new file mode 100644
--- /dev/null
+++ b/debian/blockdiag3.1
@@@ -1,0 -1,0 +1,78 @@@
++.\" Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH BLOCKDIAG3 1 "May 9, 2011"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh disable hyphenation
++.\" .hy enable hyphenation
++.\" .ad l left justify
++.\" .ad b justify to both left and right margins
++.\" .nf disable filling
++.\" .fi enable filling
++.\" .br insert line break
++.\" .sp <n> insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++blockdiag3 \- generate block-diagram image file from spec-text file.
++.SH SYNOPSIS
++.B blockdiag3
++.RI [ options ] " file"
++.SH DESCRIPTION
++This manual page documents briefly the
++.B blockdiag3
++commands.
++.PP
++.\" TeX users may be more comfortable with the \fB<whatever>\fP and
++.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
++.\" respectively.
++\fBblockdiag3\fP is a program that generate block-diagram image file from spec-text file.
++.SH OPTIONS
++These programs follow the usual GNU command line syntax, with long
++options starting with two dashes (`-').
++A summary of options is included below.
++For a complete description, see the \fBSEE ALSO\fP.
++.TP
++.B \-\-version
++show program's version number and exit
++.TP
++.B \-h, \-\-help
++Show summary of options
++.TP
++.B \-a, \-\-antialias
++Pass diagram image to anti-alias filter
++.TP
++.B \-c FILE, \-\-config=FILE
++read configurations from FILE
++.TP
++.B \-o FILE
++write diagram to FILE
++.TP
++.B \-f FONT, \-\-font=FONT
++use FONT to draw diagram
++.TP
++.B \-\-fontmap=FONT
++use FONTMAP file to draw diagram
++.TP
++.B \-s, \-\-separate
++Separate diagram images for each group
++.TP
++.B \-T TYPE
++Output diagram as TYPE format
++.TP
++.B \-\-nodoctype
++Do not output doctype definition tags (SVG only)
++.TP
++.B \-\-no-transparency
++do not make transparent background of diagram (PNG only)
++.SH SEE ALSO
++The programs are documented fully by
++.br
++.BR http://tk0miya.bitbucket.org/blockdiag/build/html/index.html
++.SH AUTHOR
++blockdiag was written by Takeshi Komiya <i.tkomiya at gmail.com>
++.PP
++This manual page was written by Kouhei Maeda <mkouhei at palmtb.net>,
++for the Debian project (and may be used by others).
diff --cc debian/changelog
index e843131,0000000..cd8e1f5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,88 -1,0 +1,114 @@@
++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/control
index aa25914,0000000..a211bb3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,63 @@@
+Source: blockdiag
+Section: python
+Priority: optional
+Maintainer: Kouhei Maeda <mkouhei at palmtb.net>
- Build-Depends: debhelper (>= 8.0.0), 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, fonts-ipafont-gothic | fonts-japanese-gothic, quilt
- Standards-Version: 3.9.4
++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,
++ 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.5
+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
++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
++Provides: ${python3:Provides}
++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/patches/Fixed-remote-image-resouces.patch
index 0000000,0000000..737260a
new file mode 100644
--- /dev/null
+++ b/debian/patches/Fixed-remote-image-resouces.patch
@@@ -1,0 -1,0 +1,24 @@@
++Description: Fixed remote image resouce for testing data.
++Author: Kouhei Maeda <mkouhei at palmtb.net>
++Last-Update: 2014-08-30
++
++--- blockdiag-1.4.3.orig/src/blockdiag/tests/diagrams/background_url_image.diag
+++++ blockdiag-1.4.3/src/blockdiag/tests/diagrams/background_url_image.diag
++@@ -1,6 +1,6 @@
++ {
++- A [background = "http://python.org/images/python-logo.gif"];
++- B [background = "http://blockdiag.com/favicon.ico"];
+++ 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"];
++ Z;
++--- blockdiag-1.4.3.orig/src/blockdiag/tests/diagrams/node_icon.diag
+++++ blockdiag-1.4.3/src/blockdiag/tests/diagrams/node_icon.diag
++@@ -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"];
++ }
diff --cc debian/patches/series
index f372c27,0000000..df0e3dc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- update_egg-info.patch
++Fixed-remote-image-resouces.patch
diff --cc debian/python-blockdiag.links
index 0000000,0000000..b0d3d41
new file mode 100644
--- /dev/null
+++ b/debian/python-blockdiag.links
@@@ -1,0 -1,0 +1,2 @@@
++usr/share/doc/python-blockdiag/testimages/debian-logo-256color-palettealpha.png usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
++usr/share/doc/python-blockdiag/testimages/white.gif usr/lib/python2.7/dist-packages/blockdiag/tests/diagrams/white.gif
diff --cc debian/python-blockdiag.manpages
index a713490,0000000..a713490
mode 100644,000000..100644
--- a/debian/python-blockdiag.manpages
+++ b/debian/python-blockdiag.manpages
diff --cc debian/python3-blockdiag.links
index 0000000,0000000..ff3e952
new file mode 100644
--- /dev/null
+++ b/debian/python3-blockdiag.links
@@@ -1,0 -1,0 +1,2 @@@
++usr/share/doc/python3-blockdiag/testimages/debian-logo-256color-palettealpha.png usr/lib/python3/dist-packages/blockdiag/tests/diagrams/debian-logo-256color-palettealpha.png
++usr/share/doc/python3-blockdiag/testimages/white.gif usr/lib/python3/dist-packages/blockdiag/tests/diagrams/white.gif
diff --cc debian/python3-blockdiag.manpages
index 0000000,0000000..96cc3f0
new file mode 100644
--- /dev/null
+++ b/debian/python3-blockdiag.manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/blockdiag3.1
diff --cc debian/rules
index fbf5bd1,0000000..f323006
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,14 -1,0 +1,26 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
- #DEB_BUILD_OPTIONS=1
++
++export PYBUILD_NAME=blockdiag
+
+%:
- dh $@ --with python2,quilt
++ 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/
+
- override_dh_auto_test:
- ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- set -e; \
- PYTHONPATH=$(CURDIR)/src nosetests -d
- endif
++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
--
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