[Pkg-octave-commit] r1122 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-21 07:45:33 +0000 (Fri, 21 Dec 2007)
New Revision: 1122

Modified:
   octave/trunk/debian/changelog
Log:
Integrate last changes regarding atlas3 into octave2.1

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-21 07:27:13 UTC (rev 1121)
+++ octave/trunk/debian/changelog	2007-12-21 07:45:33 UTC (rev 1122)
@@ -1,20 +1,17 @@
-octave2.9 (1:2.9.19-3) UNRELEASED; urgency=low
-
-  * debian/in/control:
-    Build-conflict with atlas3-base-dev and remove it from build-depends
-    (closes: 457167)
-
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 20 Dec 2007 12:32:57 +0100
-
 octave2.1 (1:2.1.73-15) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * debian/rules: Kludge for preventing octave.st from being installed in
     version 2.1 of the octave*.* package, avoiding clashes with octave2.9
     (closes: #457191).  This is a temporary solution; octave.st will
     eventually be incorporated into the enscript package (see Bug#457244).
 
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 21 Dec 2007 00:12:43 +0100
+  [ Thomas Weber ]
+  * debian/in/control: Build-conflict with atlas3-base-dev and remove it
+    from build-depends (closes: 457167)
 
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 21 Dec 2007 08:36:27 +0100
+
 octave2.9 (1:2.9.19-2) unstable; urgency=low
 
   * Synched with the last octave2.1 release