[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.3.3-2-4-g3e9d61c

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 3ad226c19a09ff88601f31a8d3ed521352ca4c03
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed May 29 17:01:17 2013 +0200

    texlive-2013.patch: new patch, fix FTBFS against recent versions of Tex Live

diff --git a/debian/patches/series b/debian/patches/series
index 67c8b41..fc63269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 extra-addpatch.patch
 fhs-compliance.patch
+texlive-2013.patch
diff --git a/debian/patches/texlive-2013.patch b/debian/patches/texlive-2013.patch
new file mode 100644
index 0000000..dae097e
--- /dev/null
+++ b/debian/patches/texlive-2013.patch
@@ -0,0 +1,84 @@
+Description: Stop using Bibtex styles recently removed from TeX Live
+ Some economic styles were unfortunately non-free.
+Origin: backport, https://github.com/DynareTeam/dynare/commit/1d14ff8060855c5e51dccd0f8b9c0cd6ccb1ae4d
+                  https://github.com/DynareTeam/dynare/commit/058a5c5dc4ad7334746805574b94608b9a8614e8
+Last-Update: 2013-05-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/dr.tex
++++ b/doc/dr.tex
+@@ -656,7 +656,7 @@
+ \citet{kamenik:2003}\footnote{This paper is distributed with Dynare, in the
+   \texttt{sylvester.pdf} file under the documentation directory.}.
+ 
+-\bibliographystyle{ecta}
++\bibliographystyle{elsarticle-harv}
+ \bibliography{dr}
+ 
+ \end{document}
+--- a/doc/userguide/UserGuide.tex
++++ b/doc/userguide/UserGuide.tex
+@@ -112,7 +112,7 @@
+ \backmatter
+ 
+ \bibliography{DynareBib}
+-\bibliographystyle{econometrica}
++\bibliographystyle{elsarticle-harv}
+ %\printindex
+ 
+ \end{document}
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,26 +113,8 @@
+ AM_CONDITIONAL([HAVE_LATEX2HTML], [test "x$LATEX2HTML" != "x"])
+ 
+ if test "x$PDFLATEX" != "x" -a "x$BIBTEX" != "x"; then
+-  AC_MSG_CHECKING([for econometrica BST])
+-  AX_LATEX_BIBTEX_TEST([\documentclass{article}
+-\begin{document}
+-\cite{Juillard1996}
+-\bibliography{conftest}
+-\bibliographystyle{econometrica}
+-\end{document}
+-], [@techreport{Juillard1996,
+-	Author = {Juillard, Michel},
+-	Institution = {CEPREMAP},
+-	Number = {9602},
+-	Title = {Dynare : a program for the resolution and simulation of dynamic models with forward variables through the use of a relaxation algorithm},
+-	Type = {CEPREMAP working papers},
+-	Year = {1996}}
+-], [ax_latex_have_econometrica])
+-  AC_MSG_RESULT([$ax_latex_have_econometrica])
+-
+   AX_LATEX_CLASS([beamer], [ax_latex_have_beamer])
+ fi
+-AM_CONDITIONAL([HAVE_ECONOMETRICA], [test "x$ax_latex_have_econometrica" = "xyes"])
+ AM_CONDITIONAL([HAVE_BEAMER], [test "x$ax_latex_have_beamer" = "xyes"])
+ 
+ AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
+@@ -241,10 +223,10 @@
+   BUILD_DYNAREPLUSPLUS_SRCDOC="no (missing one of: cweave, pdftex, eplain)"
+ fi
+ 
+-if test "x$PDFLATEX" != "x" -a "x$BIBTEX" != "x" -a "x$ax_latex_have_econometrica" = "xyes"; then
++if test "x$PDFLATEX" != "x" -a "x$BIBTEX" != "x"; then
+   BUILD_DYNARE_USERGUIDE="yes"
+ else
+-  BUILD_DYNARE_USERGUIDE="no (missing one of: pdflatex, bibtex, econometrica BST)"
++  BUILD_DYNARE_USERGUIDE="no (missing one of: pdflatex, bibtex)"
+ fi
+ 
+ if test "x$PDFLATEX" != "x" -a "x$ax_latex_have_beamer" = "xyes"; then
+--- a/doc/userguide/Makefile.am
++++ b/doc/userguide/Makefile.am
+@@ -1,10 +1,8 @@
+ if HAVE_PDFLATEX
+ if HAVE_BIBTEX
+-if HAVE_ECONOMETRICA
+ pdf-local: UserGuide.pdf
+ endif
+ endif
+-endif
+ 
+ SRC = UserGuide.tex Graphics/DynareTitle.pdf DynareBib.bib \
+ 	ch-intro.tex ch-inst.tex ch-solbase.tex ch-soladv.tex ch-estbase.tex \

-- 
Debian packaging for dynare