[Pkg-octave-commit] [SCM] Debian packaging for octave-odepkg branch, master, updated. upstream/0.8.0-23-g8a5d764

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 8a5d76407b565a17ba660f7165343fe7acdab5ac
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Apr 20 11:45:36 2012 +0000

    Drop patch fix-short-circuit-warning.patch (applied upstream)

diff --git a/debian/patches/fix-short-circuit-warning.patch b/debian/patches/fix-short-circuit-warning.patch
deleted file mode 100644
index d21afc1..0000000
--- a/debian/patches/fix-short-circuit-warning.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 6c0facb..9262944 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 info-dir-section.diff
-fix-short-circuit-warning.patch

-- 
Debian packaging for octave-odepkg