[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.4-1-20-gb9144af

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 0cbf557b57fdfaa9b53a3427082f3e6978815f04
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Mar 19 21:37:39 2012 +0100

    debian/patches/parallel-build: remove patch, applied upstream

diff --git a/debian/patches/parallel-build b/debian/patches/parallel-build
deleted file mode 100644
index 55014a5..0000000
--- a/debian/patches/parallel-build
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix parallel build problem in "make html"
-Origin: https://www.dynare.org/trac/changeset/33b81e192039f545052ad6bb35e3cdd3a2b81e53
-Applied-Upstream: 4.2.5
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -4,7 +4,9 @@
- 
- if HAVE_TEXI2HTML
- if HAVE_LATEX2HTML
--html-local: dynare.texi
-+html-local: dynare.html
-+
-+dynare.html: dynare.texi
- 	rm -rf dynare.html
- 	mkdir -p dynare.html
- 	cd dynare.html && $(TEXI2HTML) --l2h --split section --prefix index ../dynare.texi
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -349,7 +349,7 @@
- $(srcdir)/dynare.info: dynare.texi $(srcdir)/version.texi
- dynare.dvi: dynare.texi $(srcdir)/version.texi
- dynare.pdf: dynare.texi $(srcdir)/version.texi
--dynare.html: dynare.texi $(srcdir)/version.texi
-+#dynare.html: dynare.texi $(srcdir)/version.texi
- $(srcdir)/version.texi:  $(srcdir)/stamp-vti
- $(srcdir)/stamp-vti: dynare.texi $(top_srcdir)/configure
- 	@(dir=.; test -f ./dynare.texi || dir=$(srcdir); \
-@@ -863,7 +863,9 @@
- 	uninstall-info-am uninstall-pdf-am uninstall-ps-am
- 
- 
-- at HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE at html-local: dynare.texi
-+ at HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE at html-local: dynare.html
-+
-+ at HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE at dynare.html: dynare.texi
- @HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE@	rm -rf dynare.html
- @HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE@	mkdir -p dynare.html
- @HAVE_LATEX2HTML_TRUE@@HAVE_TEXI2HTML_TRUE@	cd dynare.html && $(TEXI2HTML) --l2h --split section --prefix index ../dynare.texi
diff --git a/debian/patches/series b/debian/patches/series
index 11d37c1..944e12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 extra-addpath
 fhs-compliance
-parallel-build

-- 
Debian packaging for dynare