[Pkg-octave-commit] [dynare] 02/05: Drop patches applied upstream.
Sébastien Villemot
sebastien at debian.org
Tue Jul 25 16:22:06 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 a75d49c15b5d9b74df9c55a545bdc7fa251a7d0e
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Jul 25 12:12:50 2017 +0200
Drop patches applied upstream.
+ clean-julia-preprocessor.patch
+ drop-texi2html.patch
+ license-files-install.patch
+ typos.patch
Gbp-Dch: Full
---
debian/patches/clean-julia-preprocessor.patch | 19 ---
debian/patches/drop-texi2html.patch | 82 -------------
debian/patches/license-files-install.patch | 18 ---
debian/patches/series | 4 -
debian/patches/typos.patch | 163 --------------------------
5 files changed, 286 deletions(-)
diff --git a/debian/patches/clean-julia-preprocessor.patch b/debian/patches/clean-julia-preprocessor.patch
deleted file mode 100644
index c53ff9e..0000000
--- a/debian/patches/clean-julia-preprocessor.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add julia preprocessor to the clean rule.
-Origin: upstream, https://github.com/DynareTeam/dynare/commit/468815e830704f09aac237478a98c2f014463b5d
-Reviewed-by: Sébastien Villemot <sebastien at debian.org>
-Last-Update: 2017-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/preprocessor/Makefile.am b/preprocessor/Makefile.am
-index 892b2b178..5a8ac507e 100644
---- a/preprocessor/Makefile.am
-+++ b/preprocessor/Makefile.am
-@@ -86,7 +86,7 @@ html-local:
- endif
-
- clean-local:
-- rm -rf ../matlab/preprocessor*
-+ rm -rf ../matlab/preprocessor* ../julia/preprocessor*
- rm -rf doc/html/
-
- EXTRA_DIST = $(BUILT_SOURCES) Doxyfile
diff --git a/debian/patches/drop-texi2html.patch b/debian/patches/drop-texi2html.patch
deleted file mode 100644
index 0a8204b..0000000
--- a/debian/patches/drop-texi2html.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/README.md
-+++ b/README.md
-@@ -81,7 +81,7 @@ A number of tools and libraries are need
- - [Beamer](http://latex-beamer.sourceforge.net/) (for some PDF presentations)
- - For building the reference manual:
- - [GNU Texinfo](http://www.gnu.org/software/texinfo/)
-- - [Texi2HTML](http://www.nongnu.org/texi2html) and [Latex2HTML](http://www.latex2html.org), if you want nice mathematical formulas in HTML output
-+ - [Latex2HTML](http://www.latex2html.org), if you want nice mathematical formulas in HTML output
- - [Doxygen](http://www.stack.nl/%7Edimitri/doxygen/) (if you want to build Dynare preprocessor source documentation)
- - For Octave, the development libraries corresponding to the UMFPACK packaged with Octave
-
-@@ -237,7 +237,7 @@ Alternatively, if you want to build ever
- - `texlive-fonts-extra` (for ccicons)
- - `latex-beamer`
- - `texinfo`
--- `texi2html`, `latex2html`
-+- `latex2html`
- - `doxygen`
-
- ## Fedora
-@@ -253,7 +253,7 @@ Alternatively, if you want to build ever
- - `automake`
- - `texlive`
- - `texinfo`
--- `texi2html`, `latex2html`
-+- `latex2html`
- - `doxygen`
-
- ## Windows
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,9 +113,6 @@ AM_CONDITIONAL([HAVE_PDFLATEX], [test "x
- AC_CHECK_PROG([BIBTEX], [bibtex], [bibtex])
- AM_CONDITIONAL([HAVE_BIBTEX], [test "x$BIBTEX" != "x"])
-
--AC_CHECK_PROG([TEXI2HTML], [texi2html], [texi2html])
--AM_CONDITIONAL([HAVE_TEXI2HTML], [test "x$TEXI2HTML" != "x"])
--
- AC_CHECK_PROG([LATEX2HTML], [latex2html], [latex2html])
- AM_CONDITIONAL([HAVE_LATEX2HTML], [test "x$LATEX2HTML" != "x"])
-
-@@ -274,10 +271,10 @@ fi
-
- if test "x$MAKEINFO" != "x"; then
- BUILD_DYNARE_INFO="yes"
-- if test "x$TEXI2HTML" != "x" -a "x$LATEX2HTML" != "x"; then
-+ if test "x$LATEX2HTML" != "x"; then
- BUILD_DYNARE_HTML_MANUAL="yes"
- else
-- BUILD_DYNARE_HTML_MANUAL="yes (but with ugly math formulas, missing texi2html or latex2html)"
-+ BUILD_DYNARE_HTML_MANUAL="yes (but with ugly math formulas, missing latex2html)"
- fi
- BUILD_DYNARE_PDF_MANUAL="yes"
- else
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -2,15 +2,14 @@ SUBDIRS = preprocessor macroprocessor us
-
- info_TEXINFOS = dynare.texi
-
--if HAVE_TEXI2HTML
- 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 L2H_TMP=$${TMPDIR:-/tmp} -c PREFIX=dynare.html dynare.texi
- endif
-
- PDF_TARGETS =
diff --git a/debian/patches/license-files-install.patch b/debian/patches/license-files-install.patch
deleted file mode 100644
index 73719dd..0000000
--- a/debian/patches/license-files-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Do not install LICENSE.md files of submodules under /usr/lib/dynare/matlab
-Origin: upstream, https://github.com/DynareTeam/dynare/commit/eef77e0d58d7132ca19525499dfbf1b489018c9c
-Reviewed-by: Sébastien Villemot <sebastien at debian.org>
-Last-Update: 2017-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/Makefile.am b/Makefile.am
-index ca84d398f..c52513252 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,6 +46,7 @@ install-exec-local:
- cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
- cp -r examples $(DESTDIR)$(pkglibdir)
- cp -r matlab $(DESTDIR)$(pkglibdir)
-+ find $(DESTDIR)$(pkglibdir) -name LICENSE.md -delete
- rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor*
- { \
- if [ -z "`file preprocessor/dynare_m | grep x86.64`" ]; then \
diff --git a/debian/patches/series b/debian/patches/series
index 234f6cd..d400ad4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
extra-addpatch.patch
hardcode-dynareroot.patch
-typos.patch
-license-files-install.patch
-clean-julia-preprocessor.patch
-drop-texi2html.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
deleted file mode 100644
index 4d7f072..0000000
--- a/debian/patches/typos.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Description: Fix various typos (thanks lintian).
-Author: Sébastien Villemot <sebastien at debian.org>
-Applied-Upstream: https://github.com/DynareTeam/dynare/commit/c5ed3260bc7ac8c772dfb707ce5266297526c0e3
- https://github.com/DynareTeam/dynare/commit/380e5ffbfa75dc7e16d1af60db88f2218da73850
-Last-Update: 2017-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/dynare++/kord/korder.cpp
-+++ b/dynare++/kord/korder.cpp
-@@ -280,9 +280,9 @@ KORD_RAISE_IF(maxk<2,
- KORD_RAISE_IF(gy.nrows()!=ypart.ny(),
- "Wrong number of rows in gy in KOrder constructor");
- KORD_RAISE_IF(gu.nrows()!=ypart.ny(),
--"Wrong number of rows in gu in KOrder constuctor");
-+"Wrong number of rows in gu in KOrder constructor");
- KORD_RAISE_IF(gu.ncols()!=nu,
--"Wrong number of columns in gu in KOrder constuctor");
-+"Wrong number of columns in gu in KOrder constructor");
-
-
- nvs[0]= ypart.nys();nvs[1]= nu;nvs[2]= nu;nvs[3]= 1;
---- a/dynare++/kord/korder.cweb
-+++ b/dynare++/kord/korder.cweb
-@@ -159,9 +159,9 @@ KOrder::KOrder(int num_stat, int num_pre
- KORD_RAISE_IF(gy.nrows() != ypart.ny(),
- "Wrong number of rows in gy in KOrder constructor");
- KORD_RAISE_IF(gu.nrows() != ypart.ny(),
-- "Wrong number of rows in gu in KOrder constuctor");
-+ "Wrong number of rows in gu in KOrder constructor");
- KORD_RAISE_IF(gu.ncols() != nu,
-- "Wrong number of columns in gu in KOrder constuctor");
-+ "Wrong number of columns in gu in KOrder constructor");
-
- // set nvs:
- nvs[0] = ypart.nys(); nvs[1] = nu; nvs[2] = nu; nvs[3] = 1;
---- a/dynare++/kord/korder_stoch.hweb
-+++ b/dynare++/kord/korder_stoch.hweb
-@@ -64,7 +64,7 @@ public:@;
- @<|IntegDerivs| constructor code@>;
- };
-
--@ This constuctor integrates a rule (namely its $g^{**}$ part) with
-+@ This constructor integrates a rule (namely its $g^{**}$ part) with
- respect to $u=\tilde\sigma\eta$, and stores to the object the
- derivatives of this integral $h$ at $(y^*,u,\sigma)=(\tilde
- y^*,0,\tilde\sigma)$. The original container of $g^{**}$, the moments of
---- a/preprocessor/DynamicModel.cc
-+++ b/preprocessor/DynamicModel.cc
-@@ -510,7 +510,7 @@ DynamicModel::writeModelEquationsOrdered
- }
- else
- {
-- cerr << "Type missmatch for equation " << equation_ID+1 << "\n";
-+ cerr << "Type mismatch for equation " << equation_ID+1 << "\n";
- exit(EXIT_FAILURE);
- }
- output << ";\n";
---- a/preprocessor/StaticModel.cc
-+++ b/preprocessor/StaticModel.cc
-@@ -341,7 +341,7 @@ StaticModel::writeModelEquationsOrdered_
- }
- else
- {
-- cerr << "Type missmatch for equation " << equation_ID+1 << "\n";
-+ cerr << "Type mismatch for equation " << equation_ID+1 << "\n";
- exit(EXIT_FAILURE);
- }
- output << ";\n";
---- a/preprocessor/ModFile.cc
-+++ b/preprocessor/ModFile.cc
-@@ -232,7 +232,7 @@ ModFile::checkPass(bool nostrict)
-
- if (mod_file_struct.dsge_prior_weight_initialized && mod_file_struct.dsge_prior_weight_in_estimated_params)
- {
-- cerr << "ERROR: dsge_prior_weight cannot be both initalized and estimated." << endl;
-+ cerr << "ERROR: dsge_prior_weight cannot be both initialized and estimated." << endl;
- exit(EXIT_FAILURE);
- }
- }
---- a/preprocessor/DynareMain.cc
-+++ b/preprocessor/DynareMain.cc
-@@ -245,7 +245,7 @@ main(int argc, char **argv)
- {
- if (strlen(argv[arg]) <= 7 || argv[arg][6] != '=')
- {
-- cerr << "Incorrect syntax for ouput option" << endl;
-+ cerr << "Incorrect syntax for output option" << endl;
- usage();
- }
- if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 7, "dynamic", 7))
-@@ -258,7 +258,7 @@ main(int argc, char **argv)
- output_mode = third;
- else
- {
-- cerr << "Incorrect syntax for ouput option" << endl;
-+ cerr << "Incorrect syntax for output option" << endl;
- usage();
- }
- }
---- a/mex/sources/bytecode/bytecode.cc
-+++ b/mex/sources/bytecode/bytecode.cc
-@@ -773,7 +773,7 @@ main(int nrhs, const char *prhs[])
- for (vector<s_plan>::iterator it = splan.begin(); it != splan.end(); it++)
- {
- mexPrintf("----------------------------------------------------------------------------------------------------\n");
-- mexPrintf("suprise #%d\n", i+1);
-+ mexPrintf("surprise #%d\n", i+1);
- if (it->exo.length())
- mexPrintf(" plan fliping var=%s (%d) exo=%s (%d) for the following periods and with the following values:\n", it->var.c_str(), it->var_num, it->exo.c_str(), it->exo_num);
- else
---- a/mex/sources/bytecode/SparseMatrix.cc
-+++ b/mex/sources/bytecode/SparseMatrix.cc
-@@ -6708,7 +6708,7 @@ dynSparseMatrix::Simulate_Newton_Two_Bou
- {
- if (restart > 2)
- {
-- mexPrintf("Divergence or slowdown occured during simulation.\nIn the next iteration, pivoting method will be applied to all periods.\n");
-+ mexPrintf("Divergence or slowdown occurred during simulation.\nIn the next iteration, pivoting method will be applied to all periods.\n");
- symbolic = false;
- alt_symbolic = true;
- markowitz_c_s = markowitz_c;
-@@ -6716,7 +6716,7 @@ dynSparseMatrix::Simulate_Newton_Two_Bou
- }
- else
- {
-- mexPrintf("Divergence or slowdown occured during simulation.\nIn the next iteration, pivoting method will be applied for a longer period.\n");
-+ mexPrintf("Divergence or slowdown occurred during simulation.\nIn the next iteration, pivoting method will be applied for a longer period.\n");
- start_compare = min(tbreak_g, periods);
- restart++;
- }
---- a/contrib/ms-sbvar/switch_dw/state_space/sbvar/VARio_matlab.c
-+++ b/contrib/ms-sbvar/switch_dw/state_space/sbvar/VARio_matlab.c
-@@ -429,7 +429,7 @@ TStateModel* CreateStateModel_VAR_matlab
- }
- break;
- case 4:
-- printf("Case %d not implimented.\n",4);
-+ printf("Case %d not implemented.\n",4);
- dw_exit(0);
- default:
- printf("Unknown type.\n");
---- a/contrib/ms-sbvar/switch_dw/switching/dw_switch.c
-+++ b/contrib/ms-sbvar/switch_dw/switching/dw_switch.c
-@@ -2054,7 +2054,7 @@ TVector ProbabilitiesState(TVector p, in
- */
- PRECISION LogProbabilityStates(int *S, TStateModel *model)
- {
-- printf("LogProbabilityStates() not implimented\n");
-+ printf("LogProbabilityStates() not implemented\n");
- dw_exit(0);
-
- /**
---- a/contrib/ms-sbvar/switch_dw/switching/dw_mdd_switch.c
-+++ b/contrib/ms-sbvar/switch_dw/switching/dw_mdd_switch.c
-@@ -1246,7 +1246,7 @@ int dw_marginal_data_density_command_lin
- // Plot marginal radius cummulative distribution
- if (dw_FindArgument_String(nargs,args,"graph") != -1)
- {
-- printf("Computing cummulative densities\n");
-+ printf("Computing cumulative densities\n");
- GraphCummulativeDensities(f_out,(char*)NULL,R,elliptical);
- fclose(f_out);
- rtrn=1;
--
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