[blockdiag] 15/29: Import Debian patch 1.3.2-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 48c4668af1b867be8d912960e09c3ea63b613ab6
Merge: d09762e 8f8eaf3
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Sat Nov 23 08:10:04 2013 +0900
Import Debian patch 1.3.2-1
MANIFEST.in | 17 +-
PKG-INFO | 992 +++++++++++----------
src/README.txt => README.rst | 966 ++++++++++----------
bootstrap.py | 234 ++---
buildout.cfg | 94 +-
debian/changelog | 15 +
debian/control | 4 +-
debian/copyright | 2 +-
debian/docs | 4 +-
debian/patches/series | 1 +
debian/patches/update_egg-info.patch | 13 +
debian/rules | 2 +-
examples/blockdiagrc | 2 +
setup.cfg | 3 +
setup.py | 231 +++--
src/TODO.txt | 14 -
src/blockdiag.egg-info/PKG-INFO | 992 +++++++++++----------
src/blockdiag.egg-info/SOURCES.txt | 11 +-
src/blockdiag.egg-info/entry_points.txt | 64 +-
src/blockdiag.egg-info/requires.txt | 5 +-
src/blockdiag/__init__.py | 32 +-
src/blockdiag/builder.py | 80 +-
src/blockdiag/command.py | 14 +-
src/blockdiag/drawer.py | 8 +-
src/blockdiag/elements.py | 5 +-
src/blockdiag/imagedraw/base.py | 5 +-
src/blockdiag/imagedraw/filters/__init__.py | 28 +-
src/blockdiag/imagedraw/filters/linejump.py | 13 +-
src/blockdiag/imagedraw/pdf.py | 9 +-
src/blockdiag/imagedraw/png.py | 62 +-
src/blockdiag/imagedraw/simplesvg.py | 32 +-
src/blockdiag/imagedraw/svg.py | 31 +-
src/blockdiag/imagedraw/textfolder.py | 20 +-
src/blockdiag/imagedraw/utils/__init__.py | 65 +-
src/blockdiag/imagedraw/utils/ellipse.py | 4 +-
src/blockdiag/metrics.py | 272 +++---
src/blockdiag/noderenderer/__init__.py | 11 +-
src/blockdiag/noderenderer/actor.py | 13 +-
src/blockdiag/noderenderer/circle.py | 5 +-
src/blockdiag/noderenderer/cloud.py | 23 +-
src/blockdiag/noderenderer/diamond.py | 9 +-
src/blockdiag/noderenderer/flowchart/database.py | 11 +-
src/blockdiag/noderenderer/flowchart/input.py | 6 +-
src/blockdiag/noderenderer/flowchart/loopin.py | 7 +-
src/blockdiag/noderenderer/flowchart/loopout.py | 7 +-
src/blockdiag/noderenderer/flowchart/terminator.py | 2 +-
src/blockdiag/noderenderer/roundedbox.py | 2 +-
src/blockdiag/noderenderer/square.py | 5 +-
src/blockdiag/noderenderer/textbox.py | 5 +-
src/blockdiag/parser.py | 223 +++--
src/blockdiag/tests/diagrams/branched.diag | 10 +-
src/blockdiag/tests/diagrams/circular_ref.diag | 10 +-
.../tests/diagrams/circular_ref_to_root.diag | 10 +-
.../tests/diagrams/circular_skipped_edge.diag | 10 +-
src/blockdiag/tests/diagrams/edge_attribute.diag | 10 +-
src/blockdiag/tests/diagrams/edge_styles.diag | 18 +-
src/blockdiag/tests/diagrams/empty_group.diag | 10 +-
.../tests/diagrams/empty_nested_group.diag | 14 +-
.../diagrams/errors/belongs_to_two_groups.diag | 18 +-
.../tests/diagrams/errors/group_follows_node.diag | 12 +-
.../tests/diagrams/errors/node_follows_group.diag | 12 +-
src/blockdiag/tests/diagrams/flowable_node.diag | 10 +-
src/blockdiag/tests/diagrams/folded_edge.diag | 12 +-
.../group_id_and_node_id_are_not_conflicted.diag | 14 +-
.../tests/diagrams/group_works_node_decorator.diag | 18 +-
.../tests/diagrams/large_group_and_node.diag | 20 +-
.../tests/diagrams/large_group_and_node2.diag | 14 +-
.../tests/diagrams/large_group_and_two_nodes.diag | 22 +-
src/blockdiag/tests/diagrams/multiple_groups.diag | 32 +-
.../tests/diagrams/multiple_nested_groups.diag | 28 +-
src/blockdiag/tests/diagrams/nested_groups.diag | 18 +-
.../tests/diagrams/nested_groups_and_edges.diag | 22 +-
.../nested_groups_work_node_decorator.diag | 22 +-
.../tests/diagrams/nested_skipped_circular.diag | 14 +-
src/blockdiag/tests/diagrams/node_attribute.diag | 24 +-
.../diagrams/node_in_group_follows_outer_node.diag | 14 +-
src/blockdiag/tests/diagrams/node_styles.diag | 10 +-
.../diagrams/outer_node_follows_node_in_group.diag | 14 +-
.../tests/diagrams/reverse_multiple_groups.diag | 32 +-
src/blockdiag/tests/diagrams/self_ref.diag | 8 +-
src/blockdiag/tests/diagrams/simple_group.diag | 14 +-
src/blockdiag/tests/diagrams/single_edge.diag | 6 +-
src/blockdiag/tests/diagrams/single_node.diag | 6 +-
src/blockdiag/tests/diagrams/skipped_circular.diag | 12 +-
src/blockdiag/tests/diagrams/skipped_edge.diag | 10 +-
src/blockdiag/tests/diagrams/triple_branched.diag | 12 +-
.../tests/diagrams/twin_circular_ref_to_root.diag | 10 +-
src/blockdiag/tests/diagrams/two_edges.diag | 6 +-
src/blockdiag/tests/diagrams/white.gif | Bin 0 -> 43 bytes
src/blockdiag/tests/test_boot_params.py | 203 ++---
src/blockdiag/tests/test_builder.py | 317 ++++---
src/blockdiag/tests/test_builder_edge.py | 294 +++---
src/blockdiag/tests/test_builder_errors.py | 192 ++--
src/blockdiag/tests/test_builder_group.py | 419 ++++-----
src/blockdiag/tests/test_builder_node.py | 273 +++---
src/blockdiag/tests/test_builder_separate.py | 80 +-
src/blockdiag/tests/test_generate_diagram.py | 169 ++--
src/blockdiag/tests/test_imagedraw_textfolder.py | 33 +-
src/blockdiag/tests/test_imagedraw_utils.py | 64 ++
src/blockdiag/tests/test_parser.py | 283 +++---
src/blockdiag/tests/test_pep8.py | 105 +--
src/blockdiag/tests/test_rst_directives.py | 236 ++---
src/blockdiag/tests/test_utils_fontmap.py | 101 ++-
src/blockdiag/tests/utils.py | 133 ++-
src/blockdiag/utils/__init__.py | 38 +-
src/blockdiag/utils/bootstrap.py | 56 +-
src/blockdiag/utils/collections.py | 39 -
src/blockdiag/utils/compat.py | 60 ++
src/blockdiag/utils/config.py | 13 +-
src/blockdiag/utils/fontmap.py | 5 +-
src/blockdiag/utils/functools.py | 39 -
src/blockdiag/utils/images.py | 74 +-
src/blockdiag/utils/jpeg.py | 5 +-
src/blockdiag/utils/myitertools.py | 18 +-
src/blockdiag/utils/namedtuple.py | 18 -
src/blockdiag/utils/rst/directives.py | 62 +-
src/blockdiag/utils/urlutil.py | 5 +-
src/blockdiag/utils/uuid.py | 4 +-
src/blockdiag_sphinxhelper.py | 20 +-
tox.ini | 20 +
120 files changed, 4219 insertions(+), 4392 deletions(-)
diff --cc debian/changelog
index 53c5baa,0000000..e843131
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,73 -1,0 +1,88 @@@
++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 e006ba3,0000000..aa25914
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.4), python-docutils, python-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
++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
+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-imaging (>= 1.1.5), python-docutils, python-reportlab
++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.
diff --cc debian/copyright
index e94c48f,0000000..f89f800
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,63 -1,0 +1,63 @@@
- Format: http://dep.debian.net/deps/dep5
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: blockdiag
+Source: http://pypi.python.org/pypi/blockdiag/
+
+Files: *
+Copyright: 2010, 2011 Takeshi Komiya <i.tkomiya at gmail.com>
+License: Apache License 2.0
+
+Files: src/blockdiag/diagparser.py
+Copyright: 2008,2009 Andrey Vlasovskikh
+License: The MIT License
+
+Files: bootstrap.py
+Copyright: 2006 Zope Foundation and Contributors
+License: Zope Public License 2.1
+
+Files: debian/*
+Copyright: 2011 Kouhei Maeda <mkouhei at palmtb.net>
+License: Apache License 2.0
+
+License: Apache License 2.0
+ 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: The MIT License
+ 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 Public License 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/docs
index 5b2f63a,0000000..2e92505
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,2 -1,0 +1,2 @@@
- src/README.txt
- src/TODO.txt
++README.rst
++
diff --cc debian/patches/series
index 0000000,0000000..f372c27
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++update_egg-info.patch
diff --cc debian/patches/update_egg-info.patch
index 0000000,0000000..f5969d1
new file mode 100644
--- /dev/null
+++ b/debian/patches/update_egg-info.patch
@@@ -1,0 -1,0 +1,13 @@@
++Description: Update Metadata-Version of egg-info
++Forwarded: not-needed
++Last-Update: 2013-11-23
++Index: blockdiag-1.3.2/src/blockdiag.egg-info/PKG-INFO
++===================================================================
++--- blockdiag-1.3.2.orig/src/blockdiag.egg-info/PKG-INFO 2013-11-23 07:47:49.039690538 +0900
+++++ blockdiag-1.3.2/src/blockdiag.egg-info/PKG-INFO 2013-11-23 07:51:40.056025930 +0900
++@@ -1,4 +1,4 @@
++-Metadata-Version: 1.0
+++Metadata-Version: 1.1
++ Name: blockdiag
++ Version: 1.3.2
++ Summary: blockdiag generates block-diagram image from text
diff --cc debian/rules
index 2ed99dd,0000000..fbf5bd1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,14 -1,0 +1,14 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#DEB_BUILD_OPTIONS=1
+
+%:
- dh $@ --with python2
++ dh $@ --with python2,quilt
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ PYTHONPATH=$(CURDIR)/src nosetests -d
+endif
--
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