[Pkg-octave-commit] rev 612 - in trunk/packages/octave/debian: . in

[Thomas Weber]

Author: thomas-guest
Date: 2006-05-30 17:28:03 +0000 (Tue, 30 May 2006)
New Revision: 612

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
Log:
Octave2.9 doesn't conflict with octave-forge anymore.


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-05-25 21:27:09 UTC (rev 611)
+++ trunk/packages/octave/debian/changelog	2006-05-30 17:28:03 UTC (rev 612)
@@ -5,6 +5,11 @@
   [ Rafael Laboissiere ]
   * debian/control: Bumped Standards-Version to 3.7.2 (no changes needed)
 
+  [ Thomas Weber ]
+  * debian/in/control: Don't conflict with octave-forge anymore 
+    (Bug #362591 was indeed a problem with the configure script and is
+    addressed by 50_fix-apiversion-2.9)
+
  -- 
  
 octave2.1 (1:2.1.73-8) unstable; urgency=low

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2006-05-25 21:27:09 UTC (rev 611)
+++ trunk/packages/octave/debian/in/control	2006-05-30 17:28:03 UTC (rev 612)
@@ -16,7 +16,7 @@
 Depends: ${shlibs:Depends}, texinfo
 Suggests: gnuplot, octave[V_2_1:2.1:][V_2_9:2.9:]-info, octave[V_2_1:2.1:][V_2_9:2.9:]-doc, octave[V_2_1:2.1:][V_2_9:2.9:]-htmldoc, octave[V_2_1:2.1:][V_2_9:2.9:]-headers (= ${Source-Version}), octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
 Replaces: octave (<= 2.0.16-2)
-Conflicts: octave (<= 2.0.16-2)[V_2_9:, octave-forge:]
+Conflicts: octave (<= 2.0.16-2)
 Provides: octave
 Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily