[Debichem-devel] Bug#708639: fix build failure with python 2.7.5 (nmu diff)

[Matthias Klose]

Package: avogadro
Version: 1.0.3-6

NMU'd, acked by Michael on irc

-------------- next part --------------
diff -Nru avogadro-1.0.3/debian/changelog avogadro-1.0.3/debian/changelog
--- avogadro-1.0.3/debian/changelog	2013-05-12 21:31:02.000000000 +0200
+++ avogadro-1.0.3/debian/changelog	2013-05-17 14:41:44.000000000 +0200
@@ -1,3 +1,10 @@
+avogadro (1.0.3-6.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix to build with the libpython multiarch location.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 17 May 2013 14:40:59 +0200
+
 avogadro (1.0.3-6) unstable; urgency=low
 
   [ Daniel Leidert ]
diff -Nru avogadro-1.0.3/debian/rules avogadro-1.0.3/debian/rules
--- avogadro-1.0.3/debian/rules	2013-05-12 21:26:57.000000000 +0200
+++ avogadro-1.0.3/debian/rules	2013-05-17 14:39:34.000000000 +0200
@@ -7,6 +7,8 @@
 export CXXFLAGS := $(CPPFLAGS) $(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,--as-needed
 
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 PYTHON_VERSION := $(shell pyversions -dv)
 
 %:
@@ -18,7 +20,7 @@
 	-DENABLE_RPATH=OFF \
 	-DENABLE_UPDATE_CHECKER=OFF \
 	-DPYTHON_EXECUTABLE=/usr/bin/python \
-	-DPYTHON_LIBRARY=/usr/lib/libpython$(PYTHON_VERSION).so \
+	-DPYTHON_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(PYTHON_VERSION).so \
 	-DPYTHON_INCLUDE_DIR=/usr/include/python$(PYTHON_VERSION)/
 
 override_dh_install: