[Python-modules-commits] r13942 - in packages/numpy/trunk/debian (changelog control)

[morph at users.alioth.debian.org]

    Date: Tuesday, July 13, 2010 @ 16:32:20
  Author: morph
Revision: 13942

removed Conflicts: all versions are already older than the ones in lenny

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2010-07-13 14:21:19 UTC (rev 13941)
+++ packages/numpy/trunk/debian/changelog	2010-07-13 16:32:20 UTC (rev 13942)
@@ -7,6 +7,7 @@
     - added python-sphinx and python-matplotlib to b-d, needed to build doc
     - drop python-numpy-ext, transitional package already in stable
     - bump Standards-Version to 3.9.0 (no changes needed)
+    - removed Conflicts: all versions are already older than the ones in lenny
   * New upstream release
   * debian/patches/04_fix_utils_deprecated.patch
     - removed, upstream code has changed
@@ -57,7 +58,7 @@
   * Use setup.py install --install-layout; specifying --prefix installs
     into the wrong location.
 
- -- Sandro Tosi <morph at debian.org>  Tue, 13 Jul 2010 07:23:42 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 13 Jul 2010 18:30:29 +0200
 
 python-numpy (1:1.3.0-3) unstable; urgency=low
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2010-07-13 14:21:19 UTC (rev 13941)
+++ packages/numpy/trunk/debian/control	2010-07-13 16:32:20 UTC (rev 13942)
@@ -15,7 +15,6 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: python-numpy-doc, python-numpy-dbg, python-nose (>= 0.10.1)
-Conflicts: python-f2py (<= 2.45.241+1926-5), python2.3-f2py, python2.4-f2py, python-scipy (<= 0.6.0-6), python-matplotlib (<< 0.90.1-3), python-numpy-dev (<= 1:1.0.3-2)
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}, python-numpy-dev, python-f2py
 Description: Numerical Python adds a fast array facility to the Python language