[Parted-maintainers] Bug#697779: pyparted: Use 'python-config --includes' to correctly detect multiarch include paths

[Tim Gardner]

Here is an even briefer patch that also removes PYTHON from the two
$(MAKE) invocations.

rtg
-- 
Tim Gardner tim.gardner at canonical.com
-------------- next part --------------
diff -Nru pyparted-3.6/debian/changelog pyparted-3.6/debian/changelog
--- pyparted-3.6/debian/changelog	2013-01-09 10:18:22.000000000 -0700
+++ pyparted-3.6/debian/changelog	2013-01-09 11:26:15.000000000 -0700
@@ -1,3 +1,12 @@
+pyparted (3.6-5ubuntu1) raring; urgency=low
+
+  * m4/python.m4 really wants the full path in the PYTHON
+    environment variable in order to correctly determine all
+    multiarch include paths.
+    Thanks to Colin Watson for the suggestion.
+
+ -- Tim Gardner <tim.gardner at canonical.com>  Wed, 09 Jan 2013 17:22:01 +0000
+
 pyparted (3.6-5) unstable; urgency=low
 
   * debian/patches/no-last-flag-check.patch:
diff -Nru pyparted-3.6/debian/rules pyparted-3.6/debian/rules
--- pyparted-3.6/debian/rules	2013-01-09 10:21:07.000000000 -0700
+++ pyparted-3.6/debian/rules	2013-01-09 12:09:39.000000000 -0700
@@ -12,15 +12,15 @@
 override_dh_auto_configure:
 	for pyvers in ${PYTHONS}; do \
 		mkdir -p build/py$$pyvers; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers;\
-		(cd build/py$$pyvers; ./configure --prefix=/usr PYTHON=python$$pyvers PYTHON_INCLUDES="`python$$pyvers-config`"); \
+		(cd build/py$$pyvers; ./configure --prefix=/usr PYTHON=/usr/bin/python$$pyvers); \
 		mkdir -p build/py$$pyvers-dbg; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers-dbg; \
-		(cd build/py$$pyvers-dbg; ./configure --prefix=/usr PYTHON=python$$pyvers-dbg CFLAGS="-g -ggdb " PYTHON_INCLUDES="`python$$pyvers-dbg-config`"); \
+		(cd build/py$$pyvers-dbg; ./configure --prefix=/usr PYTHON=/usr/bin/python$$pyvers-dbg CFLAGS="-g -ggdb"); \
 	done
 
 override_dh_auto_build:  
 	for pyvers in ${PYTHONS}; do \
-		(cd build/py$$pyvers/; $(MAKE) PYTHON=python$$pyvers); \
-		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python$$pyvers-dbg-config --includes`); \
+		(cd build/py$$pyvers/; $(MAKE)); \
+		(cd build/py$$pyvers-dbg/; $(MAKE)); \
 	done
 
 override_dh_auto_install: