[blockdiag] 19/29: Import Debian patch 1.4.5-1
Andreas Tille
tille at debian.org
Tue Jan 10 21:35:59 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 226d4a1b79f8afefcf5218ad26482f141f94ab0e
Merge: d626fad dd30e52
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Mon Oct 13 14:13:26 2014 +0900
Import Debian patch 1.4.5-1
README.rst => CHANGES.rst | 134 +------
MANIFEST.in | 2 +-
PKG-INFO | 429 +--------------------
README.rst | 427 --------------------
debian/changelog | 11 +
debian/control | 2 +-
debian/copyright | 16 +-
debian/patches/Fixed-remote-image-resouces.patch | 12 +-
src/blockdiag.egg-info/PKG-INFO | 429 +--------------------
src/blockdiag.egg-info/SOURCES.txt | 1 +
src/blockdiag/__init__.py | 2 +-
src/blockdiag/builder.py | 22 +-
src/blockdiag/elements.py | 11 +-
src/blockdiag/plugins/__init__.py | 4 +
.../tests/rst/test_blockdiag_directives.py | 32 +-
src/blockdiag/tests/test_generate_diagram.py | 20 +
src/blockdiag/utils/bootstrap.py | 11 +-
src/blockdiag/utils/compat.py | 11 +
src/blockdiag/utils/images.py | 8 +-
src/blockdiag/utils/rst/directives.py | 5 +-
20 files changed, 149 insertions(+), 1440 deletions(-)
diff --cc debian/changelog
index cd8e1f5,0000000..8e2dab9
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,114 -1,0 +1,125 @@@
++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/control
index a211bb3,0000000..e834d53
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,63 -1,0 +1,63 @@@
+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,
+ 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
++Standards-Version: 3.9.6
+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
+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/copyright
index f89f800,0000000..16ce6c0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,63 -1,0 +1,63 @@@
+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
++License: Apache-2
+
- Files: src/blockdiag/diagparser.py
++Files: src/blockdiag/parser.py
+Copyright: 2008,2009 Andrey Vlasovskikh
- License: The MIT License
++License: Expat
+
+Files: bootstrap.py
+Copyright: 2006 Zope Foundation and Contributors
- License: Zope Public License 2.1
++License: Zope-2.1
+
+Files: debian/*
+Copyright: 2011 Kouhei Maeda <mkouhei at palmtb.net>
- License: Apache License 2.0
++License: Apache-2
+
- License: Apache License 2.0
++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: The MIT License
++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 Public License 2.1
++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 737260a,0000000..623ea35
mode 100644,000000..100644
--- a/debian/patches/Fixed-remote-image-resouces.patch
+++ b/debian/patches/Fixed-remote-image-resouces.patch
@@@ -1,24 -1,0 +1,28 @@@
+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
++Index: blockdiag-1.4.5/src/blockdiag/tests/diagrams/background_url_image.diag
++===================================================================
++--- blockdiag-1.4.5.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-13 13:49:24.186071532 +0900
+++++ blockdiag-1.4.5/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-13 13:49:24.182071490 +0900
+@@ -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
++Index: blockdiag-1.4.5/src/blockdiag/tests/diagrams/node_icon.diag
++===================================================================
++--- blockdiag-1.4.5.orig/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-13 13:49:24.186071532 +0900
+++++ blockdiag-1.4.5/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-13 13:49:24.182071490 +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"];
+ }
--
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