[blockdiag] 05/29: Import Debian patch 1.1.4-1
Andreas Tille
tille at debian.org
Tue Jan 10 21:35:57 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 dddb4dfdac1cc9f58c18f0bfe19a6de7bc85281d
Merge: bf3c88a fdb8942
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date: Tue Apr 17 08:39:10 2012 +0900
Import Debian patch 1.1.4-1
PKG-INFO | 14 +++-
blockdiag.1 | 6 ++
debian/changelog | 17 ++++
debian/control | 6 +-
debian/patches/fontdetect | 37 +++++++++
debian/patches/series | 1 +
debian/patches/update_egg-info | 14 ++--
debian/rules | 6 ++
src/README.txt | 12 +++
src/blockdiag.egg-info/PKG-INFO | 14 +++-
src/blockdiag.egg-info/SOURCES.txt | 2 +
src/blockdiag/__init__.py | 2 +-
src/blockdiag/builder.py | 19 ++---
src/blockdiag/command.py | 3 +-
src/blockdiag/drawer.py | 10 +--
src/blockdiag/elements.py | 49 +++++++++--
src/blockdiag/imagedraw/pdf.py | 6 ++
src/blockdiag/imagedraw/png.py | 14 +++-
src/blockdiag/imagedraw/svg.py | 6 ++
src/blockdiag/metrics.py | 76 ++++++++++++++++-
src/blockdiag/noderenderer/__init__.py | 2 +-
src/blockdiag/noderenderer/actor.py | 16 ++--
src/blockdiag/parser.py | 5 +-
src/blockdiag/tests/diagrams/circular_ref2.diag | 4 +
src/blockdiag/tests/diagrams/edge_datamodels.diag | 3 +
src/blockdiag/tests/test_boot_params.py | 17 ++++
src/blockdiag/tests/test_builder.py | 12 ++-
src/blockdiag/tests/test_rst_directives.py | 99 ++++++++++++++++++++++-
src/blockdiag/utils/bootstrap.py | 13 ++-
src/blockdiag/utils/rst/directives.py | 32 +++++++-
30 files changed, 455 insertions(+), 62 deletions(-)
diff --cc debian/changelog
index 962c661,0000000..3ae178c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,0 +1,33 @@@
++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 a6024f3,0000000..472ec38
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 (>= 7.0.50~), python-all, python-setuptools
- Standards-Version: 3.9.2
++Build-Depends: debhelper (>= 8.0.0), python-all, python-setuptools, python-unittest2, pep8, python-nose, python-zc.buildout, python-funcparserlib (>= 0.3.5), python-docutils, python-imaging (>= 1.1.5), python-webcolors, python-reportlab, fonts-ipafont-gothic | fonts-japanese-gothic
++Standards-Version: 3.9.3
+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.5), python-imaging (>= 1.1.5)
++Depends: ${misc:Depends}, ${python:Depends}, python-funcparserlib (>= 0.3.5), python-imaging (>= 1.1.5), python-docutils, python-reportlab
+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/patches/fontdetect
index 0000000,0000000..5752a51
new file mode 100644
--- /dev/null
+++ b/debian/patches/fontdetect
@@@ -1,0 -1,0 +1,37 @@@
++Fix path ipagp.ttf, change detect glob pattern.
++Because the package has changed ttf-ipafont-gothic to fonts-ipafont-gochic,
++and not case installed fonts-ipafont-gothic.
++Index: blockdiag-1.1.4/src/blockdiag/utils/bootstrap.py
++===================================================================
++--- blockdiag-1.1.4.orig/src/blockdiag/utils/bootstrap.py 2012-02-13 18:59:29.000000000 +0900
+++++ blockdiag-1.1.4/src/blockdiag/utils/bootstrap.py 2012-04-17 08:52:10.704635620 +0900
++@@ -181,13 +181,22 @@
++
++
++ def detectfont(options):
++- fonts = ['c:/windows/fonts/VL-Gothic-Regular.ttf', # for Windows
++- 'c:/windows/fonts/msgothic.ttf', # for Windows
++- 'c:/windows/fonts/msgoth04.ttc', # for Windows
++- '/usr/share/fonts/truetype/ipafont/ipagp.ttf', # for Debian
++- '/usr/local/share/font-ipa/ipagp.otf', # for FreeBSD
++- '/Library/Fonts/Hiragino Sans GB W3.otf', # for MacOS
++- '/System/Library/Fonts/AppleGothic.ttf'] # for MacOS
+++ fonts = [
+++ # for Windows
+++ 'c:/windows/fonts/VL-Gothic-Regular.ttf',
+++ 'c:/windows/fonts/msgothic.ttf',
+++ 'c:/windows/fonts/msgoth04.ttc',
+++ # for FreeBSD
+++ '/usr/local/share/font-ipa/ipagp.otf',
+++ # for MacOS
+++ '/Library/Fonts/Hiragino Sans GB W3.otf',
+++ '/System/Library/Fonts/AppleGothic.ttf']
+++
+++ # fot Debian
+++ import glob
+++ for f in glob.glob('/usr/share/fonts/truetype/*/*.ttf'):
+++ fonts.append(f)
+++ fonts.append('/usr/share/fonts/truetype/fonts-japanese-gothic.ttf')
++
++ fontpath = None
++ if options.font:
diff --cc debian/patches/series
index 9e5a465,0000000..82e5723
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+update_egg-info
++fontdetect
diff --cc debian/patches/update_egg-info
index 2bff7ec,0000000..584fb93
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.2/src/blockdiag.egg-info/PKG-INFO
++Index: blockdiag-1.1.4/src/blockdiag.egg-info/PKG-INFO
+===================================================================
- --- blockdiag-1.1.2.orig/src/blockdiag.egg-info/PKG-INFO 2012-01-07 10:35:06.453736612 +0900
- +++ blockdiag-1.1.2/src/blockdiag.egg-info/PKG-INFO 2012-01-07 10:35:48.332259864 +0900
++--- 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
+@@ -1,4 +1,4 @@
+-Metadata-Version: 1.0
++Metadata-Version: 1.1
+ Name: blockdiag
- Version: 1.1.2
++ Version: 1.1.4
+ Summary: blockdiag generate block-diagram image file from spec-text file.
- Index: blockdiag-1.1.2/src/blockdiag.egg-info/requires.txt
++Index: blockdiag-1.1.4/src/blockdiag.egg-info/requires.txt
+===================================================================
- --- blockdiag-1.1.2.orig/src/blockdiag.egg-info/requires.txt 2012-01-07 10:35:06.453736612 +0900
- +++ blockdiag-1.1.2/src/blockdiag.egg-info/requires.txt 2012-01-07 10:35:48.332259864 +0900
++--- 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
+@@ -2,7 +2,6 @@
+ funcparserlib
+ webcolors
+ PIL
+-OrderedDict
+
+ [rst]
+ docutils
diff --cc debian/rules
index b137190,0000000..a907ce4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,19 -1,0 +1,25 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#DEB_BUILD_OPTIONS=1
+
+%:
+ dh $@ --with python2
+
++override_dh_auto_test:
++ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
++ set -e; \
++ PYTHONPATH=$(CURDIR)/src nosetests -d
++endif
++
+override_dh_python2:
+ dh_python2
+ rm -rf $(CURDIR)/debian/python-blockdiag/usr/share/pyshared/blockdiag/tests/
+ rm -rf $(CURDIR)/debian/python-blockdiag/usr/lib/python2.?/dist-packages/blockdiag/tests/
--
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