Hi,

Thanks to Piotr for giving me an account to svn.

As a first patch, I remove the build-conflicts on atlas, while still
avoiding explicit linking against it; this should create exactly the
same package as before, without the need for the build conflicts. I
did not want to commit directly since this is my first time, I put the
patch inline instead:

cheers,

David

Index: debian/control
===================================================================
--- debian/control      (revision 7482)
+++ debian/control      (working copy)
@@ -4,7 +4,6 @@
 Maintainer: Debian Python Modules Team
<python-modules-t...@lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zu...@debian.org>, Alexandre Fayolle
<afayo...@debian.org>, Jos√(c) Fonseca <j_r_fons...@yahoo.co.uk>,
Matthias Klose <d...@debian.org>, Ondrej Certik <ond...@certik.cz>,
Kumar Appaiah <aku...@debian.org>
 Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-all-dbg,
python-central (>= 0.6), gfortran (>= 4:4.2), libblas-dev [!arm
!m68k], liblapack-dev [!arm !m68k], debhelper (>= 5.0.38), patchutils,
python-docutils, libfftw3-dev, quilt
-Build-Conflicts: atlas3-base-dev, libatlas-headers,
libatlas-base-dev, libatlas-sse-dev, libatlas-sse2-dev,
libatlas-3dnow-dev
 XS-Python-Version: >= 2.3
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk
Index: debian/changelog
===================================================================
--- debian/changelog    (revision 7482)
+++ debian/changelog    (working copy)
@@ -1,3 +1,11 @@
+python-numpy (1:1.2.1-2) unstable; urgency=low
+
+  * Force numpy to build without ATLAS support, so that no explicit linking
+    against ATLAS is done, even when it is installed on the build machine
+  * Remove build-conflicts on any atlas-related package
+
+ -- david <da...@evans>  Wed, 11 Feb 2009 17:56:26 +0900
+
 python-numpy (1:1.2.1-1) unstable; urgency=low

   * New upstream release
Index: debian/rules
===================================================================
--- debian/rules        (revision 7482)
+++ debian/rules        (working copy)
@@ -18,6 +18,7 @@
 DEB_PYTHON_PACKAGES_EXCLUDE=python-numpy-dbg

 unexport LDFLAGS
+export ATLAS=None

 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk


--
To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to