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 191c1b401338e7f528c25cc2011a6feb42ae6b33..fb050f302322aa903f624783d42358a0d8e94953 100644 (file)
--- 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 a1d4952258d709541cb4c62543b98c0cf515db3c..292ecc9d063aa148a5ffe9810833e11ba1f83f2c 100755 (executable)
--- 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