[Pkg-octave-commit] [dynare] 06/07: Incorporate another upstream commit into drop-texi2html.patch.

Sébastien Villemot sebastien at debian.org
Thu Jun 29 11:11:18 UTC 2017


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

sebastien pushed a commit to branch master
in repository dynare.

commit 2c564ba76ea3f6bf2d81d427481308a5d44d4bb0
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jun 29 12:34:11 2017 +0200

    Incorporate another upstream commit into drop-texi2html.patch.
    
    Gbp-Dch: Ignore
---
 debian/patches/drop-texi2html.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/drop-texi2html.patch b/debian/patches/drop-texi2html.patch
index ec9307e..0a8204b 100644
--- a/debian/patches/drop-texi2html.patch
+++ b/debian/patches/drop-texi2html.patch
@@ -1,7 +1,8 @@
 Description: Drop texi2html requirement (obsolete software), use texi2any instead. 
 Origin: upstream, https://github.com/DynareTeam/dynare/commit/1607db3c936327386977be54ccfe71e56f15dbcc
+                  https://github.com/DynareTeam/dynare/commit/72d8d12b6133596523595f225114922ab147d809
 Reviewed-by: Sébastien Villemot <sebastien at debian.org>
-Last-Update: 2017-06-28
+Last-Update: 2017-06-29
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/README.md
@@ -60,7 +61,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  else
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -2,15 +2,12 @@ SUBDIRS = preprocessor macroprocessor us
+@@ -2,15 +2,14 @@ SUBDIRS = preprocessor macroprocessor us
  
  info_TEXINFOS = dynare.texi
  
@@ -68,12 +69,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  if HAVE_LATEX2HTML
  html-local: dynare.html
  
++# The temporary directory for latex2html (L2H_TMP) must not contain a dot, so
++# enforce standard tmp directory instead of defaulting to current directory
  dynare.html: dynare.texi
  	rm -rf dynare.html
 -	mkdir -p dynare.html
 -	cd dynare.html && $(TEXI2HTML) --l2h --split section --prefix index ../dynare.texi
 -endif
-+	texi2any --html --split=section -c L2H=1 -c PREFIX=dynare.html dynare.texi
++	texi2any --html --split=section -c L2H=1 -c L2H_TMP=$${TMPDIR:-/tmp} -c PREFIX=dynare.html dynare.texi
  endif
  
  PDF_TARGETS =

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/dynare.git



More information about the Pkg-octave-commit mailing list