[med-svn] [python-schema-salad] 07/07: stop generating manpage via help2man since this is broken by this upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-schema-salad.

commit 03b9483bd1f0e2704e7f985f8610bbc3275a260f
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 9 23:40:50 2016 +0100

    stop generating manpage via help2man since this is broken by this upstream version
---
 debian/changelog | 6 ++++--
 debian/control   | 3 ++-
 debian/copyright | 2 +-
 debian/rules     | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3922a4d..44e1e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-python-schema-salad (1.1.21.20161206204028-1) UNRELEASED; urgency=medium
+python-schema-salad (1.21.20161206204028-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream version
   * Adjust watch file to fetch only 1.x series - ignore 2.x for the moment
   * cme fix dpkg-control
   * debhelper 10
+  * stop generating manpage via help2man since this is broken by this upstream
+    version
 
- -- Andreas Tille <tille at debian.org>  Fri, 09 Dec 2016 22:07:34 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 09 Dec 2016 22:12:31 +0100
 
 python-schema-salad (1.6.20160202222448-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 16a9fff..13a3a42 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 10),
                python-yaml,
                python-rdflib-jsonld,
                python-rdflib,
-               help2man
+               python-typing,
+#               help2man
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/python-schema-salad.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/python-schema-salad.git
diff --git a/debian/copyright b/debian/copyright
index c1d67d2..66fa1b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: schema-salad
 Source: https://pypi.python.org/pypi/schema-salad
 
diff --git a/debian/rules b/debian/rules
index 2a2a82e..f37d608 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,11 @@ export PYBUILD_DISABLE=test
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
-override_dh_auto_build:
+override_dh_auto_build_manpage_creation_does_not_work:
 	dh_auto_build
 	PYTHONPATH=$(shell echo .pybuild/*/build/) help2man --no-info \
 		   --version-string=${VERSION} \
+		   --no-discard-stderr \
 		--name="Schema Annotations for Linked Avro Data (SALAD)" \
 		python\ schema_salad/main.py > debian/schema-salad-tool.1
 	sed -i 's/main.py/schema-salad-tool/g' debian/schema-salad-tool.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-schema-salad.git