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

[Vincent Crevot]

The following commit has been merged in the master branch:
commit 4300420509f0cbd4f76bbd38983184e861a0df38
Author: Vincent Crevot <vincent.crevot at nodalink.com>
Date:   Wed Feb 16 06:35:18 2011 +0100

    Update patches

diff --git a/debian/changelog b/debian/changelog
index 21da740..c2bec4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ dynare (4.2.0-1) UNRELEASED; urgency=low
   * debian/control:
     - Bump boost dependency to 1.36
     - Add boost dependency to dynare-matlab package
+  * patches/extra-addpath:
+    Refreshed patch.
+  * debian/patches/build-matlab:
+    Removed patch.
 
  -- Vincent Crevot <vincent.crevot at nodalink.com>  Wed, 16 Feb 2011 04:51:03 +0100
 
diff --git a/debian/patches/build-matlab b/debian/patches/build-matlab
deleted file mode 100644
index 874b351..0000000
--- a/debian/patches/build-matlab
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix paths to reflect structure of Debian packaging
---- a/mex/sources/build_matlab.m
-+++ b/mex/sources/build_matlab.m
-@@ -17,7 +17,7 @@
- % You should have received a copy of the GNU General Public License
- % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
- 
--addpath '../../matlab'; % For matlab_ver_less_than
-+addpath '/usr/share/dynare/matlab'; % For matlab_ver_less_than
- 
- MATLAB_PATH = matlabroot;
- 
-@@ -66,7 +66,7 @@
-     COMPILE_OPTIONS = [ COMPILE_OPTIONS ' -largeArrayDims' ];
- end
- 
--OUTPUT_DIR = '../matlab';
-+OUTPUT_DIR = '/usr/lib/dynare/mex/matlab';
- 
- disp(' ')
- if exist(OUTPUT_DIR,'dir')
-@@ -219,3 +219,5 @@
-        BLAS_PATH ' ' LAPACK_PATH]);
- 
- rmdir(LIBDYNAREPP_DIR, 's')
-+
-+exit
diff --git a/debian/patches/fhs-compliance b/debian/patches/fhs-compliance
index 8641db2..15b0eb4 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,42 +35,43 @@
+@@ -35,44 +35,45 @@
  if nargin
      addpath(path_to_dynare);
  end
@@ -12,11 +12,17 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
 -addpath([dynareroot '/distributions/'])
 -addpath([dynareroot '/kalman/'])
 -addpath([dynareroot '/kalman/likelihood'])
+-addpath([dynareroot '/kalman/smoother'])
 -addpath([dynareroot '/AIM/'])
+-addpath([dynareroot '/partial_information/'])
+-addpath([dynareroot '/parallel/'])
 +addpath([dynareroot_mfiles '/distributions/'])
 +addpath([dynareroot_mfiles '/kalman/'])
 +addpath([dynareroot_mfiles '/kalman/likelihood'])
++addpath([dynareroot_mfiles '/kalman/smoother'])
 +addpath([dynareroot_mfiles '/AIM/'])
++addpath([dynareroot_mfiles '/partial_information/'])
++addpath([dynareroot_mfiles '/parallel/'])
  
  % For functions that exist only under some Octave versions
  % or some MATLAB versions, and for which we provide some replacement functions
@@ -49,15 +55,14 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
 +    addpath([dynareroot_mfiles '/missing/bicgstab'])
  end
  
- % orschur() is missing in Octave; we don't have a real replacement;
- % the one we provide just exits with an error message
- if exist('OCTAVE_VERSION')
--    addpath([dynareroot '/missing/ordschur'])
-+    addpath([dynareroot_mfiles '/missing/ordschur'])
+ % bsxfun is missing in old versions of matlab (octave?)
+ if ~exist('OCTAVE_VERSION') && matlab_ver_less_than('7.4')
+-    addpath([dynareroot '/missing/bsxfun'])
++    addpath([dynareroot_mfiles '/missing/bsxfun'])
  end
  
- % Add path to MEX files
-@@ -141,10 +142,10 @@
+ 
+@@ -144,10 +145,10 @@
  %% subfolders if valid mex files exist.
  matlab_path = path;
  for i=1:number_of_mex_files
@@ -70,7 +75,7 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
          matlab_path = path;
      end
  end
-@@ -156,7 +157,7 @@
+@@ -159,7 +160,7 @@
  for i=1:number_of_mex_files
      test = (exist(mex_status{i,1},'file') == 3);
      if ~test
diff --git a/debian/patches/series b/debian/patches/series
index 6a730d0..944e12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-build-matlab
 extra-addpath
 fhs-compliance

-- 
dynare