[blockdiag] 25/29: Import Debian patch 1.4.7-2

[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 00a27a848a0231e3c5ebc1c9cc6cd7b7981f3621
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Tue Oct 27 16:41:46 2015 +0900

    Import Debian patch 1.4.7-2
---
 debian/changelog                             | 13 +++++++++++++
 debian/patches/compat-pep8-1.5.7_1.6.x.patch | 23 +++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  4 ++++
 debian/watch                                 |  3 ++-
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dd1e598..389636f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+blockdiag (1.4.7-2) unstable; urgency=medium
+
+  * Fixes FTBFS: unknown format: SVG (Closes: #796371)
+    - debian/rules
+      * Adds PYBUILD_{BEFORE,AFTER}_{BUILD,TEST},
+        Thanks Piotr Ożarowski <piotr at debian.org>.
+    - debian/patches
+      * Adds compat-pep8-1.5.7_1.6.x.patch.
+  * debian/watch
+    - Fixes debian-watch-file-unsupported-pypi-url
+
+ -- Kouhei Maeda <mkouhei at palmtb.net>  Tue, 27 Oct 2015 16:41:46 +0900
+
 blockdiag (1.4.7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/compat-pep8-1.5.7_1.6.x.patch b/debian/patches/compat-pep8-1.5.7_1.6.x.patch
new file mode 100644
index 0000000..87c9415
--- /dev/null
+++ b/debian/patches/compat-pep8-1.5.7_1.6.x.patch
@@ -0,0 +1,23 @@
+Description: Resolve compatibility problems with the version of the difference of pep8
+Author: Kouhei Maeda <mkouhei at palmtb.net>
+Last-Update: 2015-10-27
+Index: blockdiag-1.4.7/src/blockdiag/tests/test_pep8.py
+===================================================================
+--- blockdiag-1.4.7.orig/src/blockdiag/tests/test_pep8.py	2015-10-27 16:13:43.000000000 +0900
++++ blockdiag-1.4.7/src/blockdiag/tests/test_pep8.py	2015-10-27 16:24:08.479706970 +0900
+@@ -15,7 +15,7 @@
+                ['repeat', True],
+                ['paths', [BASE_DIR]]]
+ 
+-    pep8style = pep8.StyleGuide(arglist, parse_argv=False, config_file=True)
++    pep8style = pep8.StyleGuide(arglist, parse_argv=False)
+     options = pep8style.options
+     if options.doctest:
+         import doctest
+Index: blockdiag-1.4.7/.pep8
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ blockdiag-1.4.7/.pep8	2015-10-27 16:24:08.479706970 +0900
+@@ -0,0 +1,2 @@
++[pep8]
++ignore = E241,E402,E731,W503
diff --git a/debian/patches/series b/debian/patches/series
index df0e3dc..cb94fb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Fixed-remote-image-resouces.patch
+compat-pep8-1.5.7_1.6.x.patch
diff --git a/debian/rules b/debian/rules
index f323006..798dbf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,10 @@
 #export DH_VERBOSE=1
 
 export PYBUILD_NAME=blockdiag
+export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/blockdiag.egg-info {build_dir}
+export PYBUILD_AFTER_BUILD=install -d {build_dir}/src; rm -rf {build_dir}/blockdiag
+export PYBUILD_BEFORE_TEST=cp -a $(CURDIR)/src/blockdiag {build_dir}/src/
+export PYBUILD_AFTER_TEST=rm -rf {build_dir}/src
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
diff --git a/debian/watch b/debian/watch
index 7dd4c95..c595c76 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-https://pypi.python.org/packages/source/b/blockdiag/blockdiag-(.*)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/blockdiag/blockdiag-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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