[blockdiag] 08/29: Import Debian patch 1.1.6-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 4080375d4cd1e761a1358b0391f3e79cc138d2b1
Merge: 607eace 36b1ea4
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Sat Jun 9 16:32:09 2012 +0900

    Import Debian patch 1.1.6-1

 PKG-INFO                                   |  8 ++++++-
 debian/changelog                           |  6 +++++
 debian/patches/fontdetect                  | 37 ------------------------------
 debian/patches/update_egg-info             | 14 +++++------
 setup.py                                   |  7 +++++-
 src/README.txt                             |  6 +++++
 src/blockdiag.egg-info/PKG-INFO            |  8 ++++++-
 src/blockdiag/__init__.py                  |  2 +-
 src/blockdiag/imagedraw/png.py             |  9 ++++----
 src/blockdiag/imagedraw/svg.py             |  2 +-
 src/blockdiag/tests/test_rst_directives.py | 14 +++++++++++
 src/blockdiag/utils/PILTextFolder.py       | 13 +++++++++--
 src/blockdiag/utils/TextFolder.py          | 11 ++-------
 src/blockdiag/utils/bootstrap.py           |  8 ++++++-
 src/blockdiag/utils/fontmap.py             |  5 ++--
 src/blockdiag/utils/rst/directives.py      | 10 ++++++++
 16 files changed, 93 insertions(+), 67 deletions(-)

diff --cc debian/changelog
index 4c4faac,0000000..dc83937
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,0 +1,45 @@@
++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/update_egg-info
index e7d16e9,0000000..2ce3358
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.5/src/blockdiag.egg-info/PKG-INFO
++Index: blockdiag-1.1.6/src/blockdiag.egg-info/PKG-INFO
 +===================================================================
- --- 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
++--- blockdiag-1.1.6.orig/src/blockdiag.egg-info/PKG-INFO	2012-06-09 16:38:23.624095316 +0900
+++++ blockdiag-1.1.6/src/blockdiag.egg-info/PKG-INFO	2012-06-09 16:38:51.221942191 +0900
 +@@ -1,4 +1,4 @@
 +-Metadata-Version: 1.0
 ++Metadata-Version: 1.1
 + Name: blockdiag
-  Version: 1.1.5
++ Version: 1.1.6
 + Summary: blockdiag generate block-diagram image file from spec-text file.
- Index: blockdiag-1.1.5/src/blockdiag.egg-info/requires.txt
++Index: blockdiag-1.1.6/src/blockdiag.egg-info/requires.txt
 +===================================================================
- --- 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
++--- blockdiag-1.1.6.orig/src/blockdiag.egg-info/requires.txt	2012-06-09 16:38:23.624095316 +0900
+++++ blockdiag-1.1.6/src/blockdiag.egg-info/requires.txt	2012-06-09 16:38:51.221942191 +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