[Pkg-octave-commit] r2775 - in dynare/trunk/debian: . patches

[Sébastien Villemot]

Author: sebastien-guest
Date: 2009-04-02 10:28:15 +0000 (Thu, 02 Apr 2009)
New Revision: 2775

Added:
   dynare/trunk/debian/dynare-common.install
   dynare/trunk/debian/patches/fhs-compliance
Modified:
   dynare/trunk/debian/control
   dynare/trunk/debian/dynare.install
   dynare/trunk/debian/patches/series
Log:
Put arch independent files in a separate package dynare-common

Modified: dynare/trunk/debian/control
===================================================================
--- dynare/trunk/debian/control	2009-04-01 22:11:28 UTC (rev 2774)
+++ dynare/trunk/debian/control	2009-04-02 10:28:15 UTC (rev 2775)
@@ -14,7 +14,7 @@
 
 Package: dynare
 Architecture: any
-Depends: octave3.0, ${shlibs:Depends}, ${misc:Depends}
+Depends: octave3.0, dynare-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: dynare-doc
 Description: suite for non-linear models with forward looking variables
  Dynare is a pre-preprocessor and a collection of GNU Octave and
@@ -25,11 +25,27 @@
  for solving and estimating dynamic stochastic general equilibrium
  (DSGE) models.
  .
- This package contains:
+ This package provides a full installation of Dynare for GNU Octave.
+ .
+ It contains:
   * the binary preprocessor
-  * the various M-files which can be run under both GNU Octave and MATLAB
   * dynamic loadable libraries for faster computation, compiled for Octave
 
+Package: dynare-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: platform independent files for Dynare
+ Dynare is a pre-preprocessor and a collection of GNU Octave and
+ MATLAB routines which can solve, simulate and estimate non-linear
+ models with forward looking variables.
+ .
+ In particular, in the field of computational economics, it is used
+ for solving and estimating dynamic stochastic general equilibrium
+ (DSGE) models.
+ .
+ This package contains the various M-files which can be run under
+ both GNU Octave and MATLAB.
+
 Package: dynare-doc
 Architecture: all
 Section: doc

Added: dynare/trunk/debian/dynare-common.install
===================================================================
--- dynare/trunk/debian/dynare-common.install	                        (rev 0)
+++ dynare/trunk/debian/dynare-common.install	2009-04-02 10:28:15 UTC (rev 2775)
@@ -0,0 +1,6 @@
+matlab/*.m                /usr/share/dynare/matlab
+matlab/gensylv/*.m        /usr/share/dynare/matlab/gensylv
+matlab/qz/*.m             /usr/share/dynare/matlab/qz
+matlab/kronecker/*.m      /usr/share/dynare/matlab/kronecker
+matlab/distributions/*.m  /usr/share/dynare/matlab/distributions
+matlab/AIM/*.m            /usr/share/dynare/matlab/AIM

Modified: dynare/trunk/debian/dynare.install
===================================================================
--- dynare/trunk/debian/dynare.install	2009-04-01 22:11:28 UTC (rev 2774)
+++ dynare/trunk/debian/dynare.install	2009-04-02 10:28:15 UTC (rev 2775)
@@ -1,9 +1,3 @@
-matlab/*.m                /usr/lib/dynare/matlab
-matlab/gensylv/*.m        /usr/lib/dynare/matlab/gensylv
-matlab/qz/*.m             /usr/lib/dynare/matlab/qz
-matlab/kronecker/*.m      /usr/lib/dynare/matlab/kronecker
-matlab/distributions/*.m  /usr/lib/dynare/matlab/distributions
-matlab/AIM/*.m            /usr/lib/dynare/matlab/AIM
 mex/octave/*.mex          /usr/lib/dynare/mex/octave
 mex/octave/rcond.m        /usr/lib/dynare/mex/octave
 preprocessor/dynare_m     /usr/lib/dynare/matlab

Added: dynare/trunk/debian/patches/fhs-compliance
===================================================================
--- dynare/trunk/debian/patches/fhs-compliance	                        (rev 0)
+++ dynare/trunk/debian/patches/fhs-compliance	2009-04-02 10:28:15 UTC (rev 2775)
@@ -0,0 +1,48 @@
+Index: dynare-4.0.3/matlab/dynare_config.m
+===================================================================
+--- dynare-4.0.3.orig/matlab/dynare_config.m	2009-04-02 11:49:49.000000000 +0200
++++ dynare-4.0.3/matlab/dynare_config.m	2009-04-02 11:49:54.000000000 +0200
+@@ -35,16 +35,17 @@
+ if nargin
+     addpath(path_to_dynare);
+ end
+-dynareroot = strrep(which('dynare.m'),'dynare.m','');
++dynareroot = '/usr/lib/dynare/matlab/';
++dynareroot_mfiles = '/usr/share/dynare/matlab/';
+ 
+ % Add path to distribution-related function if under Matlab
+ % without the statistics toolbox
+ if ~exist('OCTAVE_VERSION') && isempty(ver('stats'))
+-    addpath([dynareroot '/distributions/'])
++    addpath([dynareroot_mfiles '/distributions/'])
+ end
+ 
+-if exist([dynareroot '/AIM'])==7  % Add path to G.Anderson AIM solver (added by GP July'08)
+-    addpath([dynareroot '/AIM/']);
++if exist([dynareroot_mfiles '/AIM'])==7  % Add path to G.Anderson AIM solver (added by GP July'08)
++    addpath([dynareroot_mfiles '/AIM/']);
+ end
+ 
+ if exist('OCTAVE_VERSION')
+@@ -77,10 +78,10 @@
+ %% subfolders if valid mex files exist.
+ matlab_path = path;
+ for i=1:number_of_mex_files
+-    test = strfind(matlab_path,[dynareroot mex_status{i,2}]);
++    test = strfind(matlab_path,[dynareroot_mfiles mex_status{i,2}]);
+     action = length(test);
+     if action
+-        rmpath([dynareroot mex_status{i,2}]);
++        rmpath([dynareroot_mfiles mex_status{i,2}]);
+         matlab_path = path;
+     end
+ end
+@@ -91,7 +92,7 @@
+ for i=1:number_of_mex_files
+     test = (exist(mex_status{i,1}) == 3);
+     if ~test
+-        addpath([dynareroot mex_status{i,2}]);
++        addpath([dynareroot_mfiles mex_status{i,2}]);
+         message = '[m]   ';
+     else
+         message = '[mex] '; 

Modified: dynare/trunk/debian/patches/series
===================================================================
--- dynare/trunk/debian/patches/series	2009-04-01 22:11:28 UTC (rev 2774)
+++ dynare/trunk/debian/patches/series	2009-04-02 10:28:15 UTC (rev 2775)
@@ -1 +1,2 @@
+fhs-compliance # Modifies dynare_config.m to reflect FHS compliance of the package
 bashisms-in-makefiles