[sumo] 01/04: Force Makefile check for errors. (Closes: #817033)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository sumo.

commit cf767d81646c202aea9754a517124267f3625ad5
Author: Santiago Vila <sanvila at debian.org>
Date:   Thu Apr 7 23:34:13 2016 +0200

    Force Makefile check for errors. (Closes: #817033)
---
 Makefile.am                         |  5 +----
 debian/patches/60_fix_docbuild.diff | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9eb89c2..38be892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,10 +7,7 @@ doc: pydoc doxygen userdoc javadoc
 pydoc:
 	rm -rf docs/pydoc
 	mkdir docs/pydoc
-	cd docs/pydoc && \
-	for i in `find ../../tools/traci ../../tools/sumolib -name "*.py" -not -executable | sed 's,../../tools/,,;s,/,.,g;s,.py,,;s,.__init__,,'`; do \
-	    PYTHONPATH="../../tools" python -c "import $$i, pydoc; pydoc.writedoc($$i)"; \
-	done
+	cd docs/pydoc && sh ../../mk-pydoc
 
 doxygen:
 	rm -rf docs/doxygen
diff --git a/debian/patches/60_fix_docbuild.diff b/debian/patches/60_fix_docbuild.diff
new file mode 100644
index 0000000..0aaafce
--- /dev/null
+++ b/debian/patches/60_fix_docbuild.diff
@@ -0,0 +1,32 @@
+Description: Force Makefile check for errors
+Author: Santiago Vila <sanvila at debian.org>
+Acked-By: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/817033
+Last-Update: 2016-04-07
+
+Index: sumo/Makefile.am
+===================================================================
+--- sumo.orig/Makefile.am
++++ sumo/Makefile.am
+@@ -7,10 +7,7 @@ doc: pydoc doxygen userdoc javadoc
+ pydoc:
+ 	rm -rf docs/pydoc
+ 	mkdir docs/pydoc
+-	cd docs/pydoc && \
+-	for i in `find ../../tools/traci ../../tools/sumolib -name "*.py" -not -executable | sed 's,../../tools/,,;s,/,.,g;s,.py,,;s,.__init__,,'`; do \
+-	    PYTHONPATH="../../tools" python -c "import $$i, pydoc; pydoc.writedoc($$i)"; \
+-	done
++	cd docs/pydoc && sh ../../mk-pydoc
+ 
+ doxygen:
+ 	rm -rf docs/doxygen
+Index: sumo/mk-pydoc
+===================================================================
+--- /dev/null
++++ sumo/mk-pydoc
+@@ -0,0 +1,5 @@
++#!/bin/sh
++set -e
++for i in `find ../../tools/traci ../../tools/sumolib -name "*.py" -not -executable | sed 's,../../tools/,,;s,/,.,g;s,.py,,;s,.__init__,,'`; do
++  PYTHONPATH="../../tools" python -c "import $i, pydoc; pydoc.writedoc($i)"
++done
diff --git a/debian/patches/series b/debian/patches/series
index c6f0819..ab14219 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 30_add_missing_link.patch
 40_drop_some_buildflags.patch
 50_use_system_openlayers.patch
+60_fix_docbuild.diff

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