[blockdiag] 13/29: Import Debian patch 1.2.4-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 d09762e25553d11c43151fc70da3cc2d8f0388df
Merge: ff0511d 12803a9
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Mon Jun 10 16:35:38 2013 +0900
Import Debian patch 1.2.4-1
PKG-INFO | 41 ++-
bootstrap.py | 10 +-
buildout.cfg | 15 +-
debian/changelog | 11 +
debian/control | 6 +-
debian/patches/fix-pep8-violations | 230 --------------
debian/patches/pep8-1.3.patch | 85 -----
debian/patches/series | 3 -
debian/patches/update_egg-info | 24 --
debian/rules | 11 -
setup.py | 8 +-
src/README.txt | 36 +++
src/blockdiag.egg-info/PKG-INFO | 41 ++-
src/blockdiag.egg-info/SOURCES.txt | 17 +-
src/blockdiag.egg-info/entry_points.txt | 5 +
src/blockdiag.egg-info/requires.txt | 3 +-
src/blockdiag/DiagramMetrics.py | 16 -
src/blockdiag/__init__.py | 2 +-
src/blockdiag/builder.py | 40 +--
src/blockdiag/command.py | 7 +-
src/blockdiag/drawer.py | 84 ++---
src/blockdiag/elements.py | 144 ++++-----
src/blockdiag/imagedraw/__init__.py | 48 +--
src/blockdiag/imagedraw/base.py | 79 +++++
src/blockdiag/imagedraw/filters/linejump.py | 27 +-
src/blockdiag/imagedraw/pdf.py | 57 ++--
src/blockdiag/imagedraw/png.py | 243 +++++++++-----
src/blockdiag/imagedraw/simplesvg.py | 37 ++-
src/blockdiag/imagedraw/svg.py | 350 +++++++++++----------
src/blockdiag/imagedraw/textfolder.py | 298 ++++++++++++++++++
src/blockdiag/imagedraw/utils/__init__.py | 115 +++++++
src/blockdiag/{ => imagedraw}/utils/ellipse.py | 29 +-
src/blockdiag/metrics.py | 322 ++++++++++---------
src/blockdiag/noderenderer/__init__.py | 23 +-
src/blockdiag/noderenderer/actor.py | 14 +-
src/blockdiag/noderenderer/beginpoint.py | 8 +-
src/blockdiag/noderenderer/box.py | 11 +-
src/blockdiag/noderenderer/circle.py | 10 +-
src/blockdiag/noderenderer/cloud.py | 31 +-
src/blockdiag/noderenderer/diamond.py | 11 +-
src/blockdiag/noderenderer/dots.py | 6 +-
src/blockdiag/noderenderer/ellipse.py | 11 +-
src/blockdiag/noderenderer/endpoint.py | 8 +-
src/blockdiag/noderenderer/flowchart/database.py | 40 ++-
src/blockdiag/noderenderer/flowchart/input.py | 13 +-
src/blockdiag/noderenderer/flowchart/loopin.py | 11 +-
src/blockdiag/noderenderer/flowchart/loopout.py | 25 +-
src/blockdiag/noderenderer/flowchart/terminator.py | 31 +-
src/blockdiag/noderenderer/mail.py | 11 +-
src/blockdiag/noderenderer/minidiamond.py | 9 +-
src/blockdiag/noderenderer/none.py | 2 +-
src/blockdiag/noderenderer/note.py | 11 +-
src/blockdiag/noderenderer/roundedbox.py | 44 ++-
src/blockdiag/noderenderer/square.py | 12 +-
src/blockdiag/noderenderer/textbox.py | 4 +-
src/blockdiag/parser.py | 66 ++--
.../tests/diagrams/diagram_attributes.diag | 1 +
src/blockdiag/tests/diagrams/node_attribute.diag | 1 +
.../diagrams/node_shape_with_none_shadow.diag | 31 ++
.../diagrams/node_shape_with_solid_shadow.diag | 31 ++
src/blockdiag/tests/test_boot_params.py | 77 ++++-
src/blockdiag/tests/test_builder.py | 2 +-
src/blockdiag/tests/test_builder_edge.py | 8 +-
src/blockdiag/tests/test_builder_errors.py | 43 +--
src/blockdiag/tests/test_builder_group.py | 5 +-
src/blockdiag/tests/test_builder_node.py | 16 +-
src/blockdiag/tests/test_builder_separate.py | 9 +-
src/blockdiag/tests/test_generate_diagram.py | 53 ++--
src/blockdiag/tests/test_imagedraw_textfolder.py | 97 ++++++
src/blockdiag/tests/test_parser.py | 141 ++++-----
src/blockdiag/tests/test_pep8.py | 62 ++--
src/blockdiag/tests/test_rst_directives.py | 148 ++++++++-
src/blockdiag/tests/test_utils_fontmap.py | 9 +-
src/blockdiag/tests/utils.py | 45 ++-
src/blockdiag/utils/PDFTextFolder.py | 29 --
src/blockdiag/utils/PILTextFolder.py | 54 ----
src/blockdiag/utils/TextFolder.py | 296 -----------------
src/blockdiag/utils/__init__.py | 65 +++-
src/blockdiag/utils/bootstrap.py | 103 ++++--
src/blockdiag/utils/config.py | 1 -
src/blockdiag/utils/fontmap.py | 7 +-
src/blockdiag/utils/functools.py | 39 +++
src/blockdiag/utils/images.py | 5 +-
src/blockdiag/utils/jpeg.py | 4 +-
src/blockdiag/utils/myitertools.py | 6 +-
src/blockdiag/utils/namedtuple.py | 3 +-
src/blockdiag/utils/rst/directives.py | 83 +++--
.../{DiagramDraw.py => utils/rst/nodes.py} | 6 +-
src/blockdiag/utils/uuid.py | 6 +-
src/blockdiag_sphinxhelper.py | 19 +-
90 files changed, 2565 insertions(+), 1796 deletions(-)
diff --cc debian/changelog
index e99030c,0000000..53c5baa
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,62 -1,0 +1,73 @@@
++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 f5736a0,0000000..e006ba3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
+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.5), python-docutils, python-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
- Standards-Version: 3.9.3
++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-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
++Standards-Version: 3.9.4
+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.5), python-imaging (>= 1.1.5), python-docutils, python-reportlab
++Depends: ${misc:Depends}, ${python:Depends}, python-funcparserlib (>= 0.3.4), python-imaging (>= 1.1.5), python-docutils, python-reportlab
+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.
diff --cc debian/rules
index a907ce4,0000000..2ed99dd
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,0 +1,14 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
- # Sample debian/rules that uses debhelper.
- # This file was originally written by Joey Hess and Craig Small.
- # As a special exception, when this file is copied by dh-make into a
- # dh-make output file, you may use that output file without restriction.
- # This special exception was added by Craig Small in version 0.37 of dh-make.
-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#DEB_BUILD_OPTIONS=1
+
+%:
+ dh $@ --with python2
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ PYTHONPATH=$(CURDIR)/src nosetests -d
+endif
-
- override_dh_python2:
- dh_python2
- rm -rf $(CURDIR)/debian/python-blockdiag/usr/share/pyshared/blockdiag/tests/
- rm -rf $(CURDIR)/debian/python-blockdiag/usr/lib/python2.?/dist-packages/blockdiag/tests/
--
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