[grass] 03/05: Add patch to prevent build failures by ignoring HTML description errors.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository grass.

commit ce9ca6e41102c560b11d4f242b3a431a40e4b96c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 8 18:06:44 2015 +0100

    Add patch to prevent build failures by ignoring HTML description errors.
---
 debian/changelog                  |  2 ++
 debian/patches/no-fail-html.patch | 21 +++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d24844..0c253b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ grass (7.0.0~rc1+ds1-1~exp2) UNRELEASED; urgency=medium
 
   * Add patch to treat GNU/{Hurd,kFreeBSD} like Linux in SC_CONFIG_CFLAGS.
   * Add patch to fix Python ctypes conversion for stat64 struct on Hurd.
+  * Add patch to prevent build failures by ignoring HTML description
+    errors.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 07 Feb 2015 20:48:47 +0100
 
diff --git a/debian/patches/no-fail-html.patch b/debian/patches/no-fail-html.patch
new file mode 100644
index 0000000..e77b143
--- /dev/null
+++ b/debian/patches/no-fail-html.patch
@@ -0,0 +1,21 @@
+Description: Don't fail the build if HTML generation fails.
+ Generating the HTML description for r.viewshed failed on GNU/Hurd reporting:
+ .
+  ERROR: Field <projection> missing
+ .
+ This single documentation error fails the entire build, to prevent this HTML
+ description errors are ignored.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Forwarded: not-needed
+
+--- a/include/Make/Html.make
++++ b/include/Make/Html.make
+@@ -11,7 +11,7 @@ $(MANDIR)/%.$(MANSECT): $(HTMLDIR)/%.htm
+ 	$(HTML2MAN) $< $@
+ 
+ %.tmp.html: $(HTMLSRC)
+-	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<,$@) ; fi
++	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<,$@) || true; fi
+ 
+ ifdef CROSS_COMPILING
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bbec2d1..b66ab6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ instdir
 check4dev
 sc-config-cflags.patch
 python-ctypes-ternary.patch
+no-fail-html.patch
 wxpy3.0-compat.patch
 parameter-typo.patch
 additionally-typo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git