[Pkg-octave-commit] [SCM] dynare branch, master, updated. f85c8cb5536a1ea4db8e0450af35d309343c6920

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit f85c8cb5536a1ea4db8e0450af35d309343c6920
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Apr 7 10:43:58 2010 +0200

    Refreshed patches

diff --git a/debian/changelog b/debian/changelog
index 550eca2..4a62641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,13 @@ dynare (4.1.1-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/copyright:
     Updated for the new release.
+  * debian/fhs-compliance,
+    debian/build-matlab:
+    Refreshed patches.
   * debian/dynare-matlab.postinst:
     Fixed bug with recent versions of MATLAB.
 
- -- Sébastien Villemot <sebastien.villemot at ens.fr>  Wed, 07 Apr 2010 10:31:53 +0200
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>  Wed, 07 Apr 2010 10:43:22 +0200
 
 dynare (4.1.0-2) unstable; urgency=low
 
diff --git a/debian/patches/build-matlab b/debian/patches/build-matlab
index 8cb8bd6..874b351 100644
--- a/debian/patches/build-matlab
+++ b/debian/patches/build-matlab
@@ -10,7 +10,7 @@ Fix paths to reflect structure of Debian packaging
  
  MATLAB_PATH = matlabroot;
  
-@@ -63,7 +63,7 @@
+@@ -66,7 +66,7 @@
      COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -largeArrayDims' ];
  end
  
@@ -19,7 +19,7 @@ Fix paths to reflect structure of Debian packaging
  
  disp(' ')
  if exist(OUTPUT_DIR,'dir')
-@@ -216,3 +216,5 @@
+@@ -219,3 +219,5 @@
         BLAS_PATH ' ' LAPACK_PATH]);
  
  rmdir(LIBDYNAREPP_DIR, 's')
diff --git a/debian/patches/fhs-compliance b/debian/patches/fhs-compliance
index 99ca133..8641db2 100644
--- a/debian/patches/fhs-compliance
+++ b/debian/patches/fhs-compliance
@@ -1,7 +1,7 @@
 Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
 --- a/matlab/dynare_config.m
 +++ b/matlab/dynare_config.m
-@@ -35,41 +35,42 @@
+@@ -35,42 +35,43 @@
  if nargin
      addpath(path_to_dynare);
  end
@@ -41,10 +41,12 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
 +    addpath([dynareroot_mfiles '/missing/ordeig'])
  end
  
- % rcond() was introduced in Octave 3.2.0
+ % rcond() and bicgstable() were introduced in Octave 3.2.0
  if exist('OCTAVE_VERSION') && octave_ver_less_than('3.2.0')
 -    addpath([dynareroot '/missing/rcond'])
+-    addpath([dynareroot '/missing/bicgstab'])
 +    addpath([dynareroot_mfiles '/missing/rcond'])
++    addpath([dynareroot_mfiles '/missing/bicgstab'])
  end
  
  % orschur() is missing in Octave; we don't have a real replacement;
@@ -55,7 +57,7 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
  end
  
  % Add path to MEX files
-@@ -140,10 +141,10 @@
+@@ -141,10 +142,10 @@
  %% subfolders if valid mex files exist.
  matlab_path = path;
  for i=1:number_of_mex_files
@@ -68,7 +70,7 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
          matlab_path = path;
      end
  end
-@@ -155,7 +156,7 @@
+@@ -156,7 +157,7 @@
  for i=1:number_of_mex_files
      test = (exist(mex_status{i,1},'file') == 3);
      if ~test

-- 
dynare