[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.4-1-20-gb9144af

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ff5a4f3a8b928ec8a3f9ddcccc0d9142477652f7
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Mar 19 22:43:44 2012 +0100

    debian/patches/extra-addpath: adapt for the new shadowed-function warning

diff --git a/debian/patches/extra-addpath b/debian/patches/extra-addpath
index bef4751..bc23d57 100644
--- a/debian/patches/extra-addpath
+++ b/debian/patches/extra-addpath
@@ -1,15 +1,25 @@
 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.
+ Also, temporarily disable the Octave:shadowed-function warning, otherwise we
+ will have a warning saying that `/usr/share/dynare/matlab/dynare.m' overrides
+ the symlink.
 Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: not-needed
+Last-Update: 2012-03-19
 --- a/matlab/dynare.m
 +++ b/matlab/dynare.m
-@@ -33,6 +33,8 @@
+@@ -33,6 +33,14 @@
  % You should have received a copy of the GNU General Public License
  % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
  
++if exist('OCTAVE_VERSION')
++    warning('off', 'Octave:shadowed-function')
++end
 +addpath /usr/share/dynare/matlab
++if exist('OCTAVE_VERSION')
++    warning('on', 'Octave:shadowed-function')
++end
 +
  if strcmpi(fname,'help')
      disp(' ')

-- 
Debian packaging for dynare