[Pkg-octave-commit] r1158 - octave2.1-forge/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-01-10 16:39:33 +0000 (Thu, 10 Jan 2008)
New Revision: 1158

Modified:
   octave2.1-forge/trunk/debian/changelog
   octave2.1-forge/trunk/debian/control
Log:
* Build-conflicts with octave3.0, since it provides octave2.9
* Set urgency to low

Modified: octave2.1-forge/trunk/debian/changelog
===================================================================
--- octave2.1-forge/trunk/debian/changelog	2008-01-10 11:44:00 UTC (rev 1157)
+++ octave2.1-forge/trunk/debian/changelog	2008-01-10 16:39:33 UTC (rev 1158)
@@ -1,4 +1,4 @@
-octave2.1-forge (2006.03.17+dfsg1-5) UNRELEASED; urgency=high
+octave2.1-forge (2006.03.17+dfsg1-5) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * debian/control:
@@ -11,13 +11,17 @@
   [ Thomas Weber ]
   * Added myself to Uploaders
   * New patch debian/patches/fix-pwelch:
-    Allow using default arguments in pwelch.m and show axis' titles; 
+    Allow using default arguments in pwelch.m and show axis' titles;
     thanks Francesco Potorti.  (Closes: #454157, #454153)
-  * debian/control: 
+  * debian/control:
     - Switch back to g77 for the time being. We'll switch to gfortran when our
       libraries are ready (Closes: 432375).
     - Use new Homepage: field
 
+  [ Rafael Laboissiere ]
+  * debian/control: Build-conflicts with octave3.0, since it provides
+    octave2.9
+
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 10 Jan 2008 10:10:04 +0100
 
 octave2.1-forge (2006.03.17+dfsg1-4) unstable; urgency=low

Modified: octave2.1-forge/trunk/debian/control
===================================================================
--- octave2.1-forge/trunk/debian/control	2008-01-10 11:44:00 UTC (rev 1157)
+++ octave2.1-forge/trunk/debian/control	2008-01-10 16:39:33 UTC (rev 1158)
@@ -9,7 +9,8 @@
  libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev,
  libreadline5-dev, texlive-generic-recommended, libgsl0-dev,
  netcdfg-dev, units, cdbs
-Build-Conflicts: octave2.0-headers, octave2.0, octave2.9-headers, octave2.9
+Build-Conflicts: octave2.0-headers, octave2.0, octave2.9-headers, octave2.9,
+ octave3.0, octave3.0-headers
 Homepage: http://octave.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave2.1-forge/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/octave2.1-forge/