[Pkg-octave-commit] [dynare] 04/12: Drop patches applied upstream:

Sébastien Villemot sebastien at moszumanska.debian.org
Tue Dec 17 12:15:51 UTC 2013 

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

sebastien pushed a commit to branch master
in repository dynare.

commit e7108fcb8623109a9c439add5bce16a87af07079
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Dec 16 19:00:17 2013 +0100

    Drop patches applied upstream:
    
    + texlive-2013.patch
    + gcc-4.8.patch
    + no-automake-werror.patch
---
 debian/patches/gcc-4.8.patch            | 26 ----------
 debian/patches/no-automake-werror.patch | 45 ------------------
 debian/patches/series                   |  3 --
 debian/patches/texlive-2013.patch       | 84 ---------------------------------
 4 files changed, 158 deletions(-)

diff --git a/debian/patches/gcc-4.8.patch b/debian/patches/gcc-4.8.patch
deleted file mode 100644
index 82e64da..0000000
--- a/debian/patches/gcc-4.8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Compatibility fix for GCC 4.8
- C++ headers can no longer be included within extern "C" blocks.
-Origin: backport, https://github.com/DynareTeam/dynare/commit/8dbf19542228ab83c4c7591bd0d93e36dc6e2a49
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701270
-Last-Update: 2013-05-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/mex/sources/ms-sbvar/modify_for_mex.cc
-+++ b/mex/sources/ms-sbvar/modify_for_mex.cc
-@@ -18,13 +18,14 @@
-  */
- 
- #if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
-+
-+#include <dynmex.h>
-+
- #ifdef __cplusplus
- extern "C"
- {
- #endif
- 
--#include <dynmex.h>
--
-   int constant_seed;
- 
-   void
diff --git a/debian/patches/no-automake-werror.patch b/debian/patches/no-automake-werror.patch
deleted file mode 100644
index 867f18d..0000000
--- a/debian/patches/no-automake-werror.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Remove -Werror from automake.
-  The new version of automake has new warnings which make this package fail to
-  build, remove -Werror so thhat the package builds again.
-Author: Peter Michael Green <plugwash at raspbian.org>
-Applied-Upstream: https://github.com/DynareTeam/dynare/commit/82edf48256843ac4c479f2df9ef03c229482a97f, 4.4.0
-
-Index: dynare-4.3.3/configure.ac
-===================================================================
---- dynare-4.3.3.orig/configure.ac	2013-10-21 18:59:21.000000000 +0000
-+++ dynare-4.3.3/configure.ac	2013-10-21 18:59:21.000000000 +0000
-@@ -20,7 +20,7 @@
- AC_PREREQ([2.62])
- AC_INIT([dynare], [4.3.3])
- AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc])
--AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability -Werror foreign no-dist-gzip dist-xz tar-pax])
-+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign no-dist-gzip dist-xz tar-pax])
- 
- AC_PROG_CC
- AC_PROG_CXX
-Index: dynare-4.3.3/mex/build/matlab/configure.ac
-===================================================================
---- dynare-4.3.3.orig/mex/build/matlab/configure.ac	2013-04-12 10:25:59.000000000 +0000
-+++ dynare-4.3.3/mex/build/matlab/configure.ac	2013-10-21 19:05:53.000000000 +0000
-@@ -20,7 +20,7 @@
- AC_PREREQ([2.61])
- AC_INIT([dynare], [4.3.3])
- AC_CONFIG_SRCDIR([configure.ac])
--AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
- 
- dnl The following must occur before we modify CFLAGS/CXXFLAGS
- AC_CANONICAL_HOST
-Index: dynare-4.3.3/mex/build/octave/configure.ac
-===================================================================
---- dynare-4.3.3.orig/mex/build/octave/configure.ac	2013-04-12 10:25:50.000000000 +0000
-+++ dynare-4.3.3/mex/build/octave/configure.ac	2013-10-21 19:06:17.000000000 +0000
-@@ -20,7 +20,7 @@
- AC_PREREQ([2.61])
- AC_INIT([dynare], [4.3.3])
- AC_CONFIG_SRCDIR([configure.ac])
--AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
- 
- AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
- 
diff --git a/debian/patches/series b/debian/patches/series
index d77556c..67c8b41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 extra-addpatch.patch
 fhs-compliance.patch
-texlive-2013.patch
-gcc-4.8.patch
-no-automake-werror.patch
diff --git a/debian/patches/texlive-2013.patch b/debian/patches/texlive-2013.patch
deleted file mode 100644
index dae097e..0000000
--- a/debian/patches/texlive-2013.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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 \

-- 
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