[Pkg-octave-commit] [SCM] Debian packaging for octave-odepkg branch, master, updated. be87a95f45031505f3676b19bdecd25464f95143

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 2f22038d06ff43a0879b89fcf32d5f0aaceff339
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 11 23:11:39 2012 +0100

    Add upstream patch to fix matlab-style possible short-circuit warning

diff --git a/debian/patches/fix-short-circuit-warning.patch b/debian/patches/fix-short-circuit-warning.patch
new file mode 100644
index 0000000..d21afc1
--- /dev/null
+++ b/debian/patches/fix-short-circuit-warning.patch
@@ -0,0 +1,16 @@
+From: Carnë Draug <carandraug+dev at gmail.com>
+Description: Fix matlab-style possible short-circuit warning
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/odepkg/inst/odebwe.m?r1=8689&r2=9518
+Last-Update: 2012-03-11
+
+--- octave-odepkg-0.8.0.orig/inst/odebwe.m
++++ octave-odepkg-0.8.0/inst/odebwe.m
+@@ -341,7 +341,7 @@ function [varargout] = odebwe (vfun, vsl
+           %# that is the matrix pencil of the mass matrix and
+           %# the right-hand-side's Jacobian. Perform a (sparse)
+           %# LU-Decomposition afterwards.
+-          if (vnewtit<=1) | (~vsimplified)
++          if (vnewtit<=1) || (~vsimplified)
+             %# Get the mass matrix from the left-hand-side
+             if (vhavemasshandle)   %# Handle only the dynamic mass matrix,
+               if (vmassdependence) %# constant mass matrices have already
diff --git a/debian/patches/series b/debian/patches/series
index 24ea99f..c61cc7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 info-dir-section.diff
 fix-call-to-print-with-name.patch
+fix-short-circuit-warning.patch

-- 
Debian packaging for octave-odepkg