[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. 67480e88c0de1c23c53fe26f699fb9594c377705

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit c47e19cd750e2256fe9bbf4fd5d79b30830b57a2
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Oct 5 17:12:32 2011 +0200

    debian/patches/{extra-addpath,fhs-compliance}: refresh, add DEP3 headers

diff --git a/debian/patches/extra-addpath b/debian/patches/extra-addpath
index 91f5b5c..bef4751 100644
--- a/debian/patches/extra-addpath
+++ b/debian/patches/extra-addpath
@@ -1,4 +1,8 @@
-Add an extra addpath at the top of dynare.m so that the symlink in /usr/share/octave/site/api-???/m works
+Description: Add Dynare root directory to the path at invocation
+ Add an extra addpath at the top of `dynare.m' so that the symlink in
+ `/usr/share/octave/site/api-v*/m' works correctly.
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
 --- a/matlab/dynare.m
 +++ b/matlab/dynare.m
 @@ -33,6 +33,8 @@
diff --git a/debian/patches/fhs-compliance b/debian/patches/fhs-compliance
index f97b514..3d2c63f 100644
--- a/debian/patches/fhs-compliance
+++ b/debian/patches/fhs-compliance
@@ -1,4 +1,8 @@
-Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
+Description: Fix paths according to the Debian package layout
+ Hardcode paths in `dynare_config.m', reflecting the FHS compliance of the
+ package.
+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 @@
@@ -32,7 +36,7 @@ Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
      % Replacement for vec() (inexistent under MATLAB)
 -    addpath([dynareroot '/missing/vec'])
 +    addpath([dynareroot_mfiles '/missing/vec'])
-     if isempty(ver('stats'))
+     if ~license('test', 'statistics_toolbox')
          % Replacements for functions of the stats toolbox
 -        addpath([dynareroot '/missing/stats/'])
 +        addpath([dynareroot_mfiles '/missing/stats/'])

-- 
Debian packaging for dynare