[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, experimental, updated. debian/4.3.2-1-5-g0e53751
Sébastien Villemot
sebastien at debian.org
Mon Apr 15 17:11:33 UTC 2013
The following commit has been merged in the experimental branch:
commit 93706fec2e158ae6a775db5f51c23a1479cf63b0
Author: Sébastien Villemot <sebastien at debian.org>
Date: Mon Apr 15 18:07:54 2013 +0200
fhs-compliance.patch: update patch
diff --git a/debian/patches/fhs-compliance.patch b/debian/patches/fhs-compliance.patch
index 2c8fef5..39c0a38 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,52 +46,52 @@
+@@ -45,57 +46,57 @@
end
@@ -81,6 +81,12 @@ Forwarded: not-needed
+ 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')
+- addpath([dynareroot '/missing/ilu'])
++ addpath([dynareroot_mfiles '/missing/ilu'])
+ end
+
% nanmean is in Octave Forge Statistics package and in MATLAB Statistics
% toolbox
if (exist('OCTAVE_VERSION') && ~user_has_octave_forge_package('statistics')) ...
@@ -90,7 +96,7 @@ Forwarded: not-needed
end
% Add path to MEX files
-@@ -190,10 +191,10 @@
+@@ -195,10 +196,10 @@
%% subfolders if valid mex files exist.
matlab_path = path;
for i=1:number_of_mex_files
@@ -103,7 +109,7 @@ Forwarded: not-needed
matlab_path = path;
end
end
-@@ -207,7 +208,7 @@
+@@ -212,7 +213,7 @@
for i=1:number_of_mex_files
test = (exist(mex_status{i,1},'file') == 3);
if ~test
--
Debian packaging for dynare
More information about the Pkg-octave-commit
mailing list