[Pkg-octave-commit] [SCM] octave-signal branch, master, updated. b990d663f312e3c2e66976e94def25c2eddc6f4e

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit e87aa33cc24bb888d7f1d769473130e0885385bc
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun May 24 19:32:43 2009 +0200

    Build-Conflicts with octave-nan, otherwise the test of filtfilt fails

diff --git a/debian/changelog b/debian/changelog
index 7d183ca..bc8ed18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ octave-signal (1.0.9-1) UNRELEASED; urgency=low
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
+    + (Build-Conflicts): Add octave-nan, otherwise the test of filtfilt
+      fails
   * debian/copyright:
     + Use DEP5 URL in Format-Specification
     + Use separate License stanzas for instructing about the location of
diff --git a/debian/control b/debian/control
index b73b811..0660734 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.6.4), quilt
+Build-Conflicts: octave-nan
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/signal
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-signal.git

-- 
octave-signal