[Pkg-octave-commit] [SCM] Debian packaging for octave-io branch, master, updated. debian/1.0.19-1-12-gdcb9424

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 6b2582266269503b172b1c6f969f86ef6767895c
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 17 10:30:11 2013 +0200

    Add Build-Conflicts with octave-java
    
    If octave-java is installed, the testsuite fails because PKG_ADD tries to load
    chk_spreadsheet_support, which is not yet in the path at that moment.

diff --git a/debian/control b/debian/control
index 3a5bde5..33c3595 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Thomas Weber <tweber at debian.org>,
            Sébastien Villemot <sebastien at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.1)
+Build-Conflicts: octave-java
 Standards-Version: 3.9.3
 Homepage: http://octave.sourceforge.net/io
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-io.git

-- 
Debian packaging for octave-io