[Pkg-octave-commit] [SCM] dynare branch, master, updated. 10ceb7a615ed34ab07825ae17f39ee2242ee859b

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit feda17effd2c4f040f90f787fd97889bbf2111b2
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Sep 14 14:58:13 2009 +0200

    Added Build-Conflicts with octave3.0

diff --git a/debian/changelog b/debian/changelog
index 556c15e..2e07398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dynare (4.0.4-4) unstable; urgency=low
 
   * debian/control:
     + Depend on Octave 3.2 (>= 3.2.2, since 3.2.0 has a buggy 'which').
+    + Add a build conflict with octave3.0.
     + Update Standards-Version to 3.8.3, no additional changes needed.
   * debian/copyright:
     Updated e-mail address of Marco Ratto.
diff --git a/debian/control b/debian/control
index 4b4a03d..48fed9a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Priority: optional
 Build-Depends: debhelper (>= 7), octave3.2-headers (>= 3.2.2), flex, bison,
  texlive, texlive-publishers, xsltproc, dblatex, latex-beamer, docbook-xsl,
  quilt, po-debconf, gnuplot-nox
+Build-Conflicts: octave3.0
 Standards-Version: 3.8.3
 Homepage: http://www.dynare.org/
 Vcs-Git: git://git.debian.org/git/pkg-octave/dynare.git

-- 
dynare