[Pkg-octave-commit] [dynare] 03/06: Refresh patch.

[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 6f632eb63ab132a9bd4a75e863df6398ecc545d5
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jan 17 16:30:11 2014 +0100

    Refresh patch.
    
    Git-Dch: Ignore
---
 debian/patches/fhs-compliance.patch | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/patches/fhs-compliance.patch b/debian/patches/fhs-compliance.patch
index 9589623..dc2451a 100644
--- a/debian/patches/fhs-compliance.patch
+++ b/debian/patches/fhs-compliance.patch
@@ -5,7 +5,7 @@ Author: Sébastien Villemot <sebastien at debian.org>
 Forwarded: not-needed
 --- a/matlab/dynare_config.m
 +++ b/matlab/dynare_config.m
-@@ -35,7 +35,8 @@
+@@ -35,7 +35,8 @@ function dynareroot = dynare_config(path
  if nargin && ~isempty(path_to_dynare)
      addpath(path_to_dynare);
  end
@@ -15,7 +15,7 @@ Forwarded: not-needed
  
  origin = pwd();
  cd([dynareroot '/..'])
-@@ -45,65 +46,65 @@
+@@ -45,66 +46,66 @@ if ~nargin || nargin==1
  end
  
  
@@ -93,8 +93,9 @@ Forwarded: not-needed
 +    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')
+ % strjoin is missing in older versions of MATLAB and in Octave < 3.8
+ if (isoctave && octave_ver_less_than('3.8')) || ...
+         (~isoctave && matlab_ver_less_than('8.1'))
 -    addpath([dynareroot '/missing/strjoin'])
 +    addpath([dynareroot_mfiles '/missing/strjoin'])
  end
@@ -108,7 +109,7 @@ Forwarded: not-needed
  end
  
  % Add path to MEX files
-@@ -210,10 +211,10 @@
+@@ -211,10 +212,10 @@ number_of_mex_files = size(mex_status,1)
  %% subfolders if valid mex files exist.
  matlab_path = path;
  for i=1:number_of_mex_files
@@ -121,7 +122,7 @@ Forwarded: not-needed
          matlab_path = path;
      end
  end
-@@ -227,7 +228,7 @@
+@@ -228,7 +229,7 @@ end
  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