[Pkg-octave-commit] [dynare] 03/12: Refresh patches.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository dynare.

commit 10c5c21c54c80fdb620855197d539a2b52c86e41
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Dec 16 18:59:39 2013 +0100

    Refresh patches.
    
    Git-Dch: Ignore
---
 debian/control                      |  2 +-
 debian/patches/extra-addpatch.patch |  2 +-
 debian/patches/fhs-compliance.patch | 34 +++++++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 24cfa29..4ec20e5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Sébastien Villemot <sebastien at debian.org>,
 Section: math
 Priority: optional
 Build-Depends: debhelper (>= 9), liboctave-dev, libboost-graph-dev (>= 1.36),
- libmatio-dev, libgsl0-dev, libslicot-dev, dh-autoreconf
+ libmatio-dev, libgsl0-dev, libslicot-dev, dh-autoreconf, libsuitesparse-dev
 Build-Depends-Indep: texlive, texlive-publishers, texlive-extra-utils,
  texlive-formats-extra, texlive-generic-recommended, texi2html, latex2html,
  latex-beamer, texlive-math-extra
diff --git a/debian/patches/extra-addpatch.patch b/debian/patches/extra-addpatch.patch
index df88e54..ce914ba 100644
--- a/debian/patches/extra-addpatch.patch
+++ b/debian/patches/extra-addpatch.patch
@@ -22,5 +22,5 @@ Last-Update: 2012-03-19
 +end
 +
  if strcmpi(fname,'help')
-     disp(' ')
+     skipline()
      disp(['This is dynare version ' dynare_version() '.'])
diff --git a/debian/patches/fhs-compliance.patch b/debian/patches/fhs-compliance.patch
index 39c0a38..9589623 100644
--- a/debian/patches/fhs-compliance.patch
+++ b/debian/patches/fhs-compliance.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
  
  origin = pwd();
  cd([dynareroot '/..'])
-@@ -45,57 +46,57 @@
+@@ -45,65 +46,65 @@
  end
  
  
@@ -33,8 +33,10 @@ Forwarded: not-needed
 -addpath([dynareroot '/ep/'])
 -addpath([dynareroot '/utilities/doc/'])
 -addpath([dynareroot '/utilities/tests/'])
+-addpath([dynareroot '/utilities/dates/'])
 -addpath([dynareroot '/utilities/dataset/'])
 -addpath([dynareroot '/utilities/general/'])
+-addpath([dynareroot '/reports/'])
 +addpath([dynareroot_mfiles '/distributions/'])
 +addpath([dynareroot_mfiles '/kalman/'])
 +addpath([dynareroot_mfiles '/kalman/likelihood'])
@@ -49,16 +51,20 @@ Forwarded: not-needed
 +addpath([dynareroot_mfiles '/ep/'])
 +addpath([dynareroot_mfiles '/utilities/doc/'])
 +addpath([dynareroot_mfiles '/utilities/tests/'])
++addpath([dynareroot_mfiles '/utilities/dates/'])
 +addpath([dynareroot_mfiles '/utilities/dataset/'])
 +addpath([dynareroot_mfiles '/utilities/general/'])
++addpath([dynareroot_mfiles '/reports/'])
  
  % For functions that exist only under some Octave versions
  % or some MATLAB versions, and for which we provide some replacement functions
  
- if ~exist('OCTAVE_VERSION')
-     % Replacements for rows() and columns() (inexistent under MATLAB)
+ if ~isoctave
+     % Replacements for rows(), columns() and issquare() (inexistent under MATLAB)
 -    addpath([dynareroot '/missing/rows_columns'])
+-    addpath([dynareroot '/missing/issquare'])
 +    addpath([dynareroot_mfiles '/missing/rows_columns'])
++    addpath([dynareroot_mfiles '/missing/issquare'])
      % Replacement for vec() (inexistent under MATLAB)
 -    addpath([dynareroot '/missing/vec'])
 +    addpath([dynareroot_mfiles '/missing/vec'])
@@ -69,34 +75,40 @@ Forwarded: not-needed
      end
  end
  
- % ordeig() was introducted in MATLAB 7.0.1, and doesn't exist in Octave
- if exist('OCTAVE_VERSION') || matlab_ver_less_than('7.0.1')
+ % ordeig() doesn't exist in Octave
+ if isoctave
 -    addpath([dynareroot '/missing/ordeig'])
 +    addpath([dynareroot_mfiles '/missing/ordeig'])
  end
  
  % bsxfun is missing in old versions of MATLAB (and exists in Octave)
- if ~exist('OCTAVE_VERSION') && matlab_ver_less_than('7.4')
+ if ~isoctave && matlab_ver_less_than('7.4')
 -    addpath([dynareroot '/missing/bsxfun'])
 +    addpath([dynareroot_mfiles '/missing/bsxfun'])
  end
  
  % ilu is missing in old versions of MATLAB and in Octave
- if exist('OCTAVE_VERSION') || matlab_ver_less_than('7.4')
+ if isoctave || matlab_ver_less_than('7.4')
 -    addpath([dynareroot '/missing/ilu'])
 +    addpath([dynareroot_mfiles '/missing/ilu'])
  end
  
+ % strjoin is missing in older versions of MATLAB and in Octave
+ if isoctave || matlab_ver_less_than('8.1')
+-    addpath([dynareroot '/missing/strjoin'])
++    addpath([dynareroot_mfiles '/missing/strjoin'])
+ end
+ 
  % nanmean is in Octave Forge Statistics package and in MATLAB Statistics
  % toolbox
- if (exist('OCTAVE_VERSION') && ~user_has_octave_forge_package('statistics')) ...
-     || (~exist('OCTAVE_VERSION') && ~user_has_matlab_license('statistics_toolbox'))
+ if (isoctave && ~user_has_octave_forge_package('statistics')) ...
+     || (~isoctave && ~user_has_matlab_license('statistics_toolbox'))
 -    addpath([dynareroot '/missing/nanmean'])
 +    addpath([dynareroot_mfiles '/missing/nanmean'])
  end
  
  % Add path to MEX files
-@@ -195,10 +196,10 @@
+@@ -210,10 +211,10 @@
  %% subfolders if valid mex files exist.
  matlab_path = path;
  for i=1:number_of_mex_files
@@ -109,7 +121,7 @@ Forwarded: not-needed
          matlab_path = path;
      end
  end
-@@ -212,7 +213,7 @@
+@@ -227,7 +228,7 @@
  for i=1:number_of_mex_files
      test = (exist(mex_status{i,1},'file') == 3);
      if ~test

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/dynare.git