[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.5-1-4-gefb5fa3

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 94f03834ac15c75c57188b6ffb2cce5e310fe9a2
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue May 8 21:27:26 2012 +0200

    remove-workaround-octave-32.patch: new patch

diff --git a/debian/patches/remove-workaround-octave-32.patch b/debian/patches/remove-workaround-octave-32.patch
new file mode 100644
index 0000000..a854390
--- /dev/null
+++ b/debian/patches/remove-workaround-octave-32.patch
@@ -0,0 +1,32 @@
+Description: Remove workaround for Octave 3.2
+ The workaround was needed in Octave 3.2 because of #550823, but it is no
+ longer needed in Octave >= 3.4. By removing the workaround, one gains 2 sec
+ when running Dynare.
+Origin: upstream, commit: 463fe51b8617c5f0a3ab271cabb992a4e7cebc5b
+Last-Update: 2012-05-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/matlab/dynare.m
++++ b/matlab/dynare.m
+@@ -16,7 +16,7 @@
+ % SPECIAL REQUIREMENTS
+ %   none
+ 
+-% Copyright (C) 2001-2011 Dynare Team
++% Copyright (C) 2001-2012 Dynare Team
+ %
+ % This file is part of Dynare.
+ %
+@@ -109,9 +109,10 @@
+     command = [command ' ' varargin{i-1}];
+ end
+ 
+-% Workaround for bug in Octave >= 3.2
++% Workaround for bug in Octave 3.2
+ % See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550823
+-if exist('OCTAVE_VERSION') && ~octave_ver_less_than('3.2.0')
++if exist('OCTAVE_VERSION') && ~octave_ver_less_than('3.2.0') ...
++        && octave_ver_less_than('3.4.0')
+     sleep(2)
+ end
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d44ae74..93d872c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 extra-addpath
 fhs-compliance
 ftbfs-gcc-47.patch
+remove-workaround-octave-32.patch

-- 
Debian packaging for dynare