[Python-modules-commits] r9590 - in packages/numpy/trunk/debian (4 files)

[akumar at users.alioth.debian.org]

    Date: Sunday, August 30, 2009 @ 14:41:23
  Author: akumar
Revision: 9590

Fix 544291 in numpy.

Added:
  packages/numpy/trunk/debian/patches/05_fix_endianness_detection.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2009-08-30 13:56:33 UTC (rev 9589)
+++ packages/numpy/trunk/debian/changelog	2009-08-30 14:41:23 UTC (rev 9590)
@@ -1,3 +1,12 @@
+python-numpy (1:1.3.0-3) unstable; urgency=low
+
+  [ Kumar Appaiah ]
+  * debian/patches/05_fix_endianness_detection.patch:
+    Force endian.h usage in npy_endian.h. Thanks to Andreas Barth
+    for bringing this to our notice. (Closes: #544291)
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Wed, 26 Aug 2009 14:20:56 -0500
+
 python-numpy (1:1.3.0-2) unstable; urgency=low
 
   [ Kumar Appaiah ]

Added: packages/numpy/trunk/debian/patches/05_fix_endianness_detection.patch
===================================================================
--- packages/numpy/trunk/debian/patches/05_fix_endianness_detection.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/05_fix_endianness_detection.patch	2009-08-30 14:41:23 UTC (rev 9590)
@@ -0,0 +1,18 @@
+Fix endianness detection: endian.h should be present on all Debian
+machines. This patch forces the use of endian.h, this preventing
+several reverse dependencies os Numpy from failing to build.
+
+Index: python-numpy-1.3.0/numpy/core/include/numpy/npy_endian.h
+===================================================================
+--- python-numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h	2009-08-30 09:25:25.000000000 -0500
++++ python-numpy-1.3.0/numpy/core/include/numpy/npy_endian.h	2009-08-30 09:25:38.000000000 -0500
+@@ -6,7 +6,8 @@
+  * endian.h
+  */
+ 
+-#ifdef NPY_HAVE_ENDIAN_H
++/*#ifdef NPY_HAVE_ENDIAN_H*/
++#if 1
+     /* Use endian.h if available */
+     #include <endian.h>
+     #define NPY_BYTE_ORDER __BYTE_ORDER

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2009-08-30 13:56:33 UTC (rev 9589)
+++ packages/numpy/trunk/debian/patches/series	2009-08-30 14:41:23 UTC (rev 9590)
@@ -2,4 +2,4 @@
 02_build_dotblas.patch
 03_force_f2py_version.patch
 04_fix_utils_deprecated.patch
-
+05_fix_endianness_detection.patch

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2009-08-30 13:56:33 UTC (rev 9589)
+++ packages/numpy/trunk/debian/rules	2009-08-30 14:41:23 UTC (rev 9590)
@@ -20,8 +20,6 @@
 unexport LDFLAGS
 export ATLAS=None
 
-CFLAGS += -DNPY_HAVE_ENDIAN_H
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk