[Pkg-octave-commit] [dynare] 07/08: Drop patches applied upstream:
Sébastien Villemot
sebastien at debian.org
Tue Jun 13 15:07:03 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 cbb4e8a69701e8e629d258f76346ad5886089a3c
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Jun 13 15:44:09 2017 +0200
Drop patches applied upstream:
+ ilu.patch
+ ordschur.patch
+ warning-language-extension.patch
Gbp-Dch: Full
---
debian/patches/hardcode-dynareroot.patch | 4 +-
debian/patches/ilu.patch | 21 -------
debian/patches/ordschur.patch | 73 -------------------------
debian/patches/series | 3 -
debian/patches/warning-language-extension.patch | 32 -----------
5 files changed, 2 insertions(+), 131 deletions(-)
diff --git a/debian/patches/hardcode-dynareroot.patch b/debian/patches/hardcode-dynareroot.patch
index 3a300fb..cc74aa8 100644
--- a/debian/patches/hardcode-dynareroot.patch
+++ b/debian/patches/hardcode-dynareroot.patch
@@ -4,10 +4,10 @@ Author: Sébastien Villemot <sebastien at debian.org>
Forwarded: not-needed
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
-@@ -35,7 +35,7 @@ function dynareroot = dynare_config(path
- if nargin && ~isempty(path_to_dynare)
+@@ -36,7 +36,7 @@ if nargin && ~isempty(path_to_dynare)
addpath(path_to_dynare);
end
+
-dynareroot = strrep(which('dynare'),'dynare.m','');
+dynareroot = '/usr/lib/dynare/matlab/';
diff --git a/debian/patches/ilu.patch b/debian/patches/ilu.patch
deleted file mode 100644
index 5aa40bc..0000000
--- a/debian/patches/ilu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: ilu function has been implemented in Octave 4.0
-Origin: upstream, https://github.com/DynareTeam/dynare/commit/139f5ae750eececbb5bc765c0622cf1ad2856c3f
- https://github.com/DynareTeam/dynare/commit/d06d0f94b6decfa11cf80c86ffa7d43ad2292cf8
- https://github.com/DynareTeam/dynare/commit/fc836cd4105c9d66f7d6d5f0ff8836557b1867fb
-Last-Update: 2015-07-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/matlab/dynare_config.m
-+++ b/matlab/dynare_config.m
-@@ -90,8 +90,9 @@ if ~isoctave && matlab_ver_less_than('7.
- addpath([dynareroot '/missing/bsxfun'])
- end
-
--% ilu is missing in old versions of MATLAB and in Octave
--if isoctave || matlab_ver_less_than('7.4')
-+% ilu is missing in old versions of MATLAB and in Octave < 4.0
-+if (isoctave && octave_ver_less_than('4.0')) || ...
-+ (~isoctave && matlab_ver_less_than('7.4'))
- addpath([dynareroot '/missing/ilu'])
- end
-
diff --git a/debian/patches/ordschur.patch b/debian/patches/ordschur.patch
deleted file mode 100644
index 0c9b8e0..0000000
--- a/debian/patches/ordschur.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: No longer compile ordschur.oct for Octave >= 4.0
- The function is now an Octave builtin.
-Origin: upstream, https://github.com/DynareTeam/dynare/commit/c91e6805886d432c9fa705066389586a4e1d74a5
-Last-Update: 2015-07-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/mex/build/octave/Makefile.am b/mex/build/octave/Makefile.am
-index d0ad940..c83e295 100644
---- a/mex/build/octave/Makefile.am
-+++ b/mex/build/octave/Makefile.am
-@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I ../../../m4
-
- # libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
- if DO_SOMETHING
--SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex ordschur block_kalman_filter sobol local_state_space_iterations
-+SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv qzcomplex block_kalman_filter sobol local_state_space_iterations
-
- if COMPILE_LINSOLVE
- SUBDIRS += linsolve
- endif
-
-+if COMPILE_ORDSCHUR
-+SUBDIRS += ordschur
-+endif
-+
- if HAVE_MATIO
- SUBDIRS += k_order_perturbation dynare_simul_
- endif
-diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac
-index 112ab80..9950d0e 100755
---- a/mex/build/octave/configure.ac
-+++ b/mex/build/octave/configure.ac
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
-
--dnl Copyright (C) 2009-2013 Dynare Team
-+dnl Copyright (C) 2009-2015 Dynare Team
- dnl
- dnl This file is part of Dynare.
- dnl
-@@ -34,9 +34,11 @@ if test "x$MKOCTFILE" != "x"; then
- OCTAVE_VERSION=`$MKOCTFILE -v 2>&1 | sed 's/mkoctfile, version //'`
- AX_COMPARE_VERSION([$OCTAVE_VERSION], [lt], [3.6], [AC_MSG_ERROR([Your Octave is too old, please upgrade to version 3.6 at least.])])
- AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [3.8], [OCTAVE38=yes])
-+ AX_COMPARE_VERSION([$OCTAVE_VERSION], [ge], [4.0], [OCTAVE40=yes])
- fi
-
- AM_CONDITIONAL([COMPILE_LINSOLVE], [test "$OCTAVE38" != "yes"])
-+AM_CONDITIONAL([COMPILE_ORDSCHUR], [test "$OCTAVE40" != "yes"])
-
- CFLAGS="$CFLAGS -Wall -Wno-parentheses"
- FFLAGS="$FFLAGS -Wall"
-@@ -112,6 +114,12 @@ else
- BUILD_LINSOLVE_OCTAVE="no (Octave >= 3.8)"
- fi
-
-+if test -n "$MKOCTFILE" -a "$OCTAVE40" != "yes"; then
-+ BUILD_ORDSCHUR_OCTAVE="yes"
-+else
-+ BUILD_ORDSCHUR_OCTAVE="no (Octave >= 4.0)"
-+fi
-+
- AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
- if test "x$enable_openmp" = "xyes"; then
- CPPFLAGS="$CPPFLAGS -DUSE_OMP"
-@@ -130,6 +138,7 @@ Binaries (with "make"):
- Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
- k-order and dynare_simul MEX for Octave: $BUILD_ESTIMATION_KORDER_DYNSIMUL_MEX_OCTAVE
- Linsolve for Octave: $BUILD_LINSOLVE_OCTAVE
-+ Ordschur for Octave: $BUILD_ORDSCHUR_OCTAVE
-
- ])
-
diff --git a/debian/patches/series b/debian/patches/series
index a12f164..d400ad4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
extra-addpatch.patch
hardcode-dynareroot.patch
-ordschur.patch
-warning-language-extension.patch
-ilu.patch
diff --git a/debian/patches/warning-language-extension.patch b/debian/patches/warning-language-extension.patch
deleted file mode 100644
index b5ef5fd..0000000
--- a/debian/patches/warning-language-extension.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Octave warning "matlab-incompatible" renamed to "language-extension" in 4.0
- Patch needed in order to avoid flows of warnings.
-Origin: upstream, https://github.com/DynareTeam/dynare/commit/6bccb4d3d7b1ea316021da334e93497ba2e61497
-Last-Update: 2015-07-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/matlab/warning_config.m b/matlab/warning_config.m
-index 6b6f533..6b19b83 100644
---- a/matlab/warning_config.m
-+++ b/matlab/warning_config.m
-@@ -10,7 +10,7 @@ function warning_config()
- % SPECIAL REQUIREMENTS
- % none
-
--% Copyright (C) 2008-2013 Dynare Team
-+% Copyright (C) 2008-2015 Dynare Team
- %
- % This file is part of Dynare.
- %
-@@ -34,7 +34,11 @@ warning('on', 'backtrace');
-
- if isoctave
- warning('off', 'Octave:separator-insert');
-- warning('off', 'Octave:matlab-incompatible');
-+ if octave_ver_less_than('4.0')
-+ warning('off', 'Octave:matlab-incompatible');
-+ else
-+ warning('off', 'Octave:language-extension');
-+ end
- warning('off', 'Octave:single-quote-string');
- warning('off', 'Octave:missing-semicolon');
- warning('off', 'Octave:empty-list-elements');
--
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