[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.5-2-18-g2a35554

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 7f9e67f7eb7643d43e46497d4245c3764ddc60fb
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Jun 17 12:08:07 2012 +0200

    fhs-compliance.patch: add .patch extension and refresh patch

diff --git a/debian/patches/fhs-compliance b/debian/patches/fhs-compliance.patch
similarity index 66%
rename from debian/patches/fhs-compliance
rename to debian/patches/fhs-compliance.patch
index cda9120..7a80182 100644
--- a/debian/patches/fhs-compliance
+++ b/debian/patches/fhs-compliance.patch
@@ -5,26 +5,52 @@ Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: not-needed
 --- a/matlab/dynare_config.m
 +++ b/matlab/dynare_config.m
-@@ -35,43 +35,44 @@
- if nargin
+@@ -35,7 +35,8 @@
+ if nargin && ~isempty(path_to_dynare)
      addpath(path_to_dynare);
  end
 -dynareroot = strrep(which('dynare'),'dynare.m','');
 +dynareroot = '/usr/lib/dynare/matlab/';
 +dynareroot_mfiles = '/usr/share/dynare/matlab/';
  
+ origin = pwd();
+ cd([dynareroot '/..'])
+@@ -45,52 +46,52 @@
+ end
+ 
+ 
 -addpath([dynareroot '/distributions/'])
 -addpath([dynareroot '/kalman/'])
 -addpath([dynareroot '/kalman/likelihood'])
 -addpath([dynareroot '/AIM/'])
 -addpath([dynareroot '/partial_information/'])
+-addpath([dynareroot '/ms-sbvar/'])
+-addpath([dynareroot '/ms-sbvar/identification/'])
+-addpath([dynareroot '../contrib/ms-sbvar/TZcode/MatlabFiles/'])
 -addpath([dynareroot '/parallel/'])
+-addpath([dynareroot '/particle/'])
+-addpath([dynareroot '/gsa/'])
+-addpath([dynareroot '/ep/'])
+-addpath([dynareroot '/utilities/doc/'])
+-addpath([dynareroot '/utilities/tests/'])
+-addpath([dynareroot '/utilities/dataset/'])
+-addpath([dynareroot '/utilities/general/'])
 +addpath([dynareroot_mfiles '/distributions/'])
 +addpath([dynareroot_mfiles '/kalman/'])
 +addpath([dynareroot_mfiles '/kalman/likelihood'])
 +addpath([dynareroot_mfiles '/AIM/'])
 +addpath([dynareroot_mfiles '/partial_information/'])
++addpath([dynareroot_mfiles '/ms-sbvar/'])
++addpath([dynareroot_mfiles '/ms-sbvar/identification/'])
++addpath([dynareroot_mfiles '../contrib/ms-sbvar/TZcode/MatlabFiles/'])
 +addpath([dynareroot_mfiles '/parallel/'])
++addpath([dynareroot_mfiles '/particle/'])
++addpath([dynareroot_mfiles '/gsa/'])
++addpath([dynareroot_mfiles '/ep/'])
++addpath([dynareroot_mfiles '/utilities/doc/'])
++addpath([dynareroot_mfiles '/utilities/tests/'])
++addpath([dynareroot_mfiles '/utilities/dataset/'])
++addpath([dynareroot_mfiles '/utilities/general/'])
  
  % For functions that exist only under some Octave versions
  % or some MATLAB versions, and for which we provide some replacement functions
@@ -49,22 +75,22 @@ Forwarded: not-needed
 +    addpath([dynareroot_mfiles '/missing/ordeig'])
  end
  
- % 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
- 
  % bsxfun is missing in old versions of MATLAB (and exists in Octave)
  if ~exist('OCTAVE_VERSION') && matlab_ver_less_than('7.4')
 -    addpath([dynareroot '/missing/bsxfun'])
 +    addpath([dynareroot_mfiles '/missing/bsxfun'])
  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'))
+-    addpath([dynareroot '/missing/nanmean'])
++    addpath([dynareroot_mfiles '/missing/nanmean'])
+ end
  
-@@ -164,10 +165,10 @@
+ % Add path to MEX files
+@@ -190,10 +191,10 @@
  %% subfolders if valid mex files exist.
  matlab_path = path;
  for i=1:number_of_mex_files
@@ -77,7 +103,7 @@ Forwarded: not-needed
          matlab_path = path;
      end
  end
-@@ -179,7 +180,7 @@
+@@ -207,7 +208,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 93d872c..c050ec4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 extra-addpath
-fhs-compliance
+fhs-compliance.patch
 ftbfs-gcc-47.patch
 remove-workaround-octave-32.patch

-- 
Debian packaging for dynare