From: Sven Hoexter <sven@timegate.de>
Date: Sat, 26 Nov 2011 08:13:52 +0000 (+0100)
Subject: Apply a small patch (forwarded from Ubuntu!) to debian/rules adding
X-Git-Tag: debian/3.05-6~2
X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fmysqltcl.git;a=commitdiff_plain;h=142e95dfafeb99191e3ca4e3a8af386fe50dae2a

Apply a small patch (forwarded from Ubuntu!) to debian/rules adding
--with-mysql-lib so that mysqltcl will work with a multiarch
libmysqlclient. (Closes: #650053)
---

diff --git a/debian/changelog b/debian/changelog
index 191c1b4..fb050f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mysqltcl (3.05-6) UNRELEASED; urgency=low
+
+  * Apply a small patch (forwarded from Ubuntu!) to debian/rules adding
+    --with-mysql-lib so that mysqltcl will work with a multiarch
+    libmysqlclient. (Closes: #650053)
+
+ -- Sven Hoexter <hoexter@debian.org>  Sat, 26 Nov 2011 09:13:01 +0100
+
 mysqltcl (3.05-5) unstable; urgency=low
 
   * Add debian/patches/tcl.m4_gnu_non_linux_ld_settings, patch provided
diff --git a/debian/rules b/debian/rules
index a1d4952..292ecc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --with quilt,autoreconf
@@ -16,6 +17,7 @@ override_dh_auto_configure:
 		--infodir=/usr/share/info \
 		--with-tcl=/usr/lib \
 		--with-tclinclude=/usr/include/tcl \
+		--with-mysql-lib=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/mysqltcl