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

[Rafael Laboissiere]

Author: rafael
Date: 2006-04-15 04:28:14 +0000 (Sat, 15 Apr 2006)
New Revision: 574

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
Log:
Debian release octave2.9_2.9.5-4


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-04-14 21:48:06 UTC (rev 573)
+++ trunk/packages/octave/debian/changelog	2006-04-15 04:28:14 UTC (rev 574)
@@ -1,3 +1,9 @@
+octave2.9 (2.9.5-4) unstable; urgency=low
+
+  * debian/in/control: Conflicts with octave-forge (closes: #362591)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 15 Apr 2006 00:13:27 +0200
+
 octave2.1 (1:2.1.73-7) unstable; urgency=low
 
   * debian/in/PACKAGE-htmldoc.doc-base.lib: Fixed path for HTML files.

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2006-04-14 21:48:06 UTC (rev 573)
+++ trunk/packages/octave/debian/in/control	2006-04-15 04:28:14 UTC (rev 574)
@@ -11,7 +11,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)
+Conflicts: octave (<= 2.0.16-2)[V_2_9:, octave-forge:]
 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