[Python-modules-commits] r24409 - in packages/numpy/trunk/debian (changelog rules)

[kitterman at users.alioth.debian.org]

    Date: Thursday, May 16, 2013 @ 15:40:55
  Author: kitterman
Revision: 24409

  * In debian/rules, use python abiflags to find include directories for both
    python3.2 and python3.3 (mu/dmu versus m/dm)

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2013-05-16 15:09:48 UTC (rev 24408)
+++ packages/numpy/trunk/debian/changelog	2013-05-16 15:40:55 UTC (rev 24409)
@@ -1,7 +1,12 @@
 python-numpy (1:1.7.1-2) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
+  [ Scott Kitterman ]
+  * In debian/rules, use python abiflags to find include directories for both
+    python3.2 and python3.3 (mu/dmu versus m/dm)
+
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:23 +0200
 
 python-numpy (1:1.7.1-1) experimental; urgency=low

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2013-05-16 15:09:48 UTC (rev 24408)
+++ packages/numpy/trunk/debian/rules	2013-05-16 15:40:55 UTC (rev 24409)
@@ -86,14 +86,16 @@
 	done
 	# Python 3
 	set -e; for i in $(PY3VERS); do \
-	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}mu ] || \
-		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}mu; \
-		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$${i}mu/numpy; \
+	ABITAG=`python$$i -c "import sys; print(sys.abiflags)"`; \
+	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG ] || \
+		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG; \
+		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$${i}$$ABITAG/numpy; \
 	done
 	set -e; for i in $(PY3VERS); do \
-	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}dmu ] || \
-		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}dmu; \
-		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}dmu/numpy; \
+	ABITAG=`python$$i-dbg -c "import sys; print(sys.abiflags)"`; \
+	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG ] || \
+		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG; \
+		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}$$ABITAG/numpy; \
 	done
 
 	# share -dbg and normal package doc dirs