[blockdiag] 07/29: Import Debian patch 1.1.5-1

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository blockdiag.

commit 607eacea92a3ea06993a8d792e9622aef730047d
Merge: dddb4df e5b151a
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Tue Apr 24 02:33:02 2012 +0900

    Import Debian patch 1.1.5-1

 PKG-INFO                                     |   7 +-
 bootstrap.py                                 | 108 +++++++++++----
 debian/changelog                             |   6 +
 debian/patches/series                        |   1 -
 debian/patches/update_egg-info               |  14 +-
 src/README.txt                               |   5 +
 src/blockdiag.egg-info/PKG-INFO              |   7 +-
 src/blockdiag/__init__.py                    |   2 +-
 src/blockdiag/drawer.py                      |   3 +-
 src/blockdiag/elements.py                    |   2 +-
 src/blockdiag/imagedraw/simplesvg.py         |   5 +
 src/blockdiag/imagedraw/svg.py               |   1 +
 src/blockdiag/metrics.py                     |   4 +-
 src/blockdiag/tests/test_boot_params.py      |  19 ++-
 src/blockdiag/tests/test_generate_diagram.py |  38 ++++++
 src/blockdiag/tests/test_rst_directives.py   | 197 ++++++++++++++++-----------
 src/blockdiag/utils/bootstrap.py             |  37 +++--
 src/blockdiag/utils/rst/directives.py        |   9 +-
 18 files changed, 325 insertions(+), 140 deletions(-)

diff --cc debian/changelog
index 3ae178c,0000000..4c4faac
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,0 +1,39 @@@
++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/series
index 82e5723,0000000..9e5a465
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +update_egg-info
- fontdetect
diff --cc debian/patches/update_egg-info
index 584fb93,0000000..e7d16e9
mode 100644,000000..100644
--- a/debian/patches/update_egg-info
+++ b/debian/patches/update_egg-info
@@@ -1,24 -1,0 +1,24 @@@
 +* Update Metadata Version of egg-info
 +* remove dependency of OrderedDict
- Index: blockdiag-1.1.4/src/blockdiag.egg-info/PKG-INFO
++Index: blockdiag-1.1.5/src/blockdiag.egg-info/PKG-INFO
 +===================================================================
- --- blockdiag-1.1.4.orig/src/blockdiag.egg-info/PKG-INFO	2012-04-08 23:47:19.827843145 +0900
- +++ blockdiag-1.1.4/src/blockdiag.egg-info/PKG-INFO	2012-04-08 23:48:45.252034682 +0900
++--- blockdiag-1.1.5.orig/src/blockdiag.egg-info/PKG-INFO	2012-04-24 02:36:34.026861178 +0900
+++++ blockdiag-1.1.5/src/blockdiag.egg-info/PKG-INFO	2012-04-24 02:37:14.646030272 +0900
 +@@ -1,4 +1,4 @@
 +-Metadata-Version: 1.0
 ++Metadata-Version: 1.1
 + Name: blockdiag
-  Version: 1.1.4
++ Version: 1.1.5
 + Summary: blockdiag generate block-diagram image file from spec-text file.
- Index: blockdiag-1.1.4/src/blockdiag.egg-info/requires.txt
++Index: blockdiag-1.1.5/src/blockdiag.egg-info/requires.txt
 +===================================================================
- --- blockdiag-1.1.4.orig/src/blockdiag.egg-info/requires.txt	2012-04-08 23:47:19.827843145 +0900
- +++ blockdiag-1.1.4/src/blockdiag.egg-info/requires.txt	2012-04-08 23:48:45.252034682 +0900
++--- blockdiag-1.1.5.orig/src/blockdiag.egg-info/requires.txt	2012-04-24 02:36:34.030859128 +0900
+++++ blockdiag-1.1.5/src/blockdiag.egg-info/requires.txt	2012-04-24 02:37:14.646030272 +0900
 +@@ -2,7 +2,6 @@
 + funcparserlib
 + webcolors
 + PIL
 +-OrderedDict
 + 
 + [rst]
 + docutils

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/blockdiag.git