[Pkg-octave-commit] r1285 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-26 00:08:42 +0000 (Tue, 26 Feb 2008)
New Revision: 1285

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
Restore conflicts of octave3.0* on the respective octave2.9* packages


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-25 23:26:12 UTC (rev 1284)
+++ octave/trunk/debian/changelog	2008-02-26 00:08:42 UTC (rev 1285)
@@ -1,3 +1,11 @@
+octave3.0 (1:3.0.0-6) UNRELEASED; urgency=low
+
+  * debian/in/control: Make all octave3.0* packages conflict with the
+    corresponding octave2.9* packages.  This is a correction for the fix
+    to Bug#463039.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 26 Feb 2008 01:07:34 +0100
+
 octave3.0 (1:3.0.0-5) unstable; urgency=low
 
   * Synched with octave2.1; in particular ensures that the generation of

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-02-25 23:26:12 UTC (rev 1284)
+++ octave/trunk/debian/in/control	2008-02-26 00:08:42 UTC (rev 1285)
@@ -29,7 +29,7 @@
  octave[V_2_1:2.1:][V_3_0:3.0:]-headers (= ${binary:Version}),
  octave[V_2_1:2.1:][V_3_0:3.0:]-emacsen
 Replaces: octave (<= 2.0.16-2)
-Conflicts: octave (<= 2.0.16-2)
+Conflicts: octave (<= 2.0.16-2)[V_3_0:, octave2.9 (<< 3):]
 Provides: octave
 Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
@@ -45,7 +45,7 @@
 Architecture: all
 Section: doc
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:], xpdf | pdf-viewer
-Conflicts: octave-doc (<< 2.1)
+Conflicts: octave-doc (<< 2.1)[V_3_0:, octave2.9-doc (<< 3):]
 Provides: octave-doc
 Replaces: octave-doc
 Description: PDF documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
@@ -62,7 +62,7 @@
 Architecture: all
 Section: doc
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:], lynx | www-browser
-Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc
+Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:, octave2.9-htmldoc (<< 3):]
 Replaces: octave-htmldoc
 Provides: octave-htmldoc
 Description: HTML documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
@@ -82,7 +82,7 @@
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
  libblas-dev, liblapack-dev, libfftw3-dev,
  ${m68k:Depends}
-Conflicts: octave-headers (<< 2.1)
+Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 3):]
 Provides: octave-headers
 Replaces: octave-headers
 Description: header files for the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
@@ -101,7 +101,7 @@
 Architecture: all
 Depends: octave[V_2_1:2.1:][V_3_0:3.0:], emacs22 | xemacs21 | emacsen,
  debianutils (>= 1.6)
-Conflicts: octave2.0-emacsen
+Conflicts: octave2.0-emacsen[V_3_0:, octave2.9-emacsen (<< 3):]
 Replaces: octave (<= 2.0.16-2)
 Provides: octave-emacsen
 Description: Emacs support for the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
@@ -115,7 +115,7 @@
 Package: octave[V_2_1:2.1:][V_3_0:3.0:]-info
 Architecture: all
 Depends: info (>= 3.12) | info-browser
-Conflicts: octave2.0-info
+Conflicts: octave2.0-info[V_3_0:, octave2.9-info (<< 3):]
 Replaces: octave (<= 2.0.16-2)
 Provides: octave-info
 Description: GNU Info documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)