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

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-22 22:27:38 +0000 (Sat, 22 Dec 2007)
New Revision: 1132

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
Dropped the build-conflict on atlas3-base-dev

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-22 15:52:01 UTC (rev 1131)
+++ octave/trunk/debian/changelog	2007-12-22 22:27:38 UTC (rev 1132)
@@ -6,8 +6,10 @@
     provide/replace/conflict with the respective octave2.9* packages.
   * debian/patches/02_prelease_warning.dpatch: Dropped patch, since this
     is the real 3.0 release
+  * debian/in/control: Dropped the build-conflict on atlas3-base-dev.  This
+    will make the autobuilders happy.
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 22 Dec 2007 16:49:54 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 22 Dec 2007 23:26:49 +0100
 
 octave2.1 (1:2.1.73-15) unstable; urgency=low
 

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2007-12-22 15:52:01 UTC (rev 1131)
+++ octave/trunk/debian/in/control	2007-12-22 22:27:38 UTC (rev 1132)
@@ -16,7 +16,6 @@
  desktop-file-utils:][V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
  desktop-file-utils:]
-Build-Conflicts: atlas3-base-dev
 Standards-Version: 3.7.3
 Homepage: http://www.octave.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/