[python-caja] 01/01: debian/patches: Add 2001_debian-python-multiarch.patch. Enforce usage of multiarch path for PY_LIB_LOC. (Closes: 766879).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository python-caja.

commit ecd6fc0eae0129498f6d4c87b1b8fd91b7b1c222
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 25 11:33:43 2014 +0100

    debian/patches: Add 2001_debian-python-multiarch.patch. Enforce usage of multiarch path for PY_LIB_LOC. (Closes: 766879).
---
 debian/patches/2001_debian-python-multiarch.patch | 20 ++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/2001_debian-python-multiarch.patch b/debian/patches/2001_debian-python-multiarch.patch
new file mode 100644
index 0000000..2c393b6
--- /dev/null
+++ b/debian/patches/2001_debian-python-multiarch.patch
@@ -0,0 +1,20 @@
+Description: python2.pc in Debian jessie does not provide the correct (multi-arch) libdir path
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ This works around Debian bug #770935. This package should stay intact
+ once that bug gets fixed. However, once that bug is fixed, this patch
+ should be dropped.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,10 @@
+ AM_PATH_PYTHON([2.7])
+ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
+ PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`"
++# nasty workaround Debian bug #770935!!!
++if ! test -r "${PYTHON_LIB_LOC}/libpython${PYTHON_VERSION}.so"; then
++	PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`/`dpkg-architecture -qDEB_BUILD_MULTIARCH`"
++fi
+ AC_SUBST(PYTHON_LIBS)
+ AC_SUBST(PYTHON_CFLAGS)
+ AC_SUBST(PYTHON_LIB_LOC)
diff --git a/debian/patches/series b/debian/patches/series
index 4740d7c..0f9e460 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001_multi-arch-libdir-in-pkgconfig.patch
 1002_dont-install-xsl-files.patch
+2001_debian-python-multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/python-caja.git