[blockdiag] 24/29: Import Debian patch 1.4.7-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 a4069183122cf529500a52bfdbc673b0beea8092
Merge: a258f9d bee839e
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Sat Oct 25 21:28:57 2014 +0900
Import Debian patch 1.4.7-1
CHANGES.rst | 6 ++++++
PKG-INFO | 2 +-
debian/changelog | 6 ++++++
debian/patches/Fixed-remote-image-resouces.patch | 12 ++++++------
debian/patches/update_egg-info.patch | 13 -------------
src/blockdiag.egg-info/PKG-INFO | 2 +-
src/blockdiag/__init__.py | 2 +-
src/blockdiag/plugins/__init__.py | 4 ++--
8 files changed, 23 insertions(+), 24 deletions(-)
diff --cc debian/changelog
index 5d133a4,0000000..dd1e598
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,140 -1,0 +1,146 @@@
++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/patches/Fixed-remote-image-resouces.patch
index a853cdb,0000000..065bf49
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,28 @@@
+Description: Fixed remote image resouce for testing data.
+Author: Kouhei Maeda <mkouhei at palmtb.net>
+Last-Update: 2014-08-30
+
- Index: blockdiag-1.4.6/src/blockdiag/tests/diagrams/background_url_image.diag
++Index: blockdiag-1.4.7/src/blockdiag/tests/diagrams/background_url_image.diag
+===================================================================
- --- blockdiag-1.4.6.orig/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-15 07:49:24.855760753 +0900
- +++ blockdiag-1.4.6/src/blockdiag/tests/diagrams/background_url_image.diag 2014-10-15 07:49:24.851760683 +0900
++--- 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 @@
+ {
+- 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;
- Index: blockdiag-1.4.6/src/blockdiag/tests/diagrams/node_icon.diag
++Index: blockdiag-1.4.7/src/blockdiag/tests/diagrams/node_icon.diag
+===================================================================
- --- blockdiag-1.4.6.orig/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-15 07:49:24.855760753 +0900
- +++ blockdiag-1.4.6/src/blockdiag/tests/diagrams/node_icon.diag 2014-10-15 07:49:24.851760683 +0900
++--- 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
+@@ -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