[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.5-2-18-g2a35554

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 7540b49abedef561d1f496541690e18c8906e7f8
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Jun 17 12:10:07 2012 +0200

    remove-workaround-octave-32.patch: remove patch, applied upstream

diff --git a/debian/patches/remove-workaround-octave-32.patch b/debian/patches/remove-workaround-octave-32.patch
deleted file mode 100644
index a854390..0000000
--- a/debian/patches/remove-workaround-octave-32.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 35dbb34..67c8b41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 extra-addpatch.patch
 fhs-compliance.patch
-remove-workaround-octave-32.patch

-- 
Debian packaging for dynare