* Add debian/patches/tcl.m4_gnu_non_linux_ld_settings, patch provided

  by Pino Toscano (thanks!), to fix the FTBFS on GNU/Hurd. Since we've
  the same problem on GNU/kfreebsd it will fix those FTBFS too.
  (Closes: #624378)
* Add build-dep on dh-autoreconf and add --with autoreconf for dh.

diff --git a/debian/changelog b/debian/changelog
index 0f3234978ea96e3ca61ed83621cff8afdf86b731..c9c1d5975b1584595549c22d79b17f67305615b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mysqltcl (3.05-5) UNRELEASED; urgency=low
+
+  * Add debian/patches/tcl.m4_gnu_non_linux_ld_settings, patch provided
+    by Pino Toscano (thanks!), to fix the FTBFS on GNU/Hurd. Since we've
+    the same problem on GNU/kfreebsd it will fix those FTBFS too.
+    (Closes: #624378)
+  * Add build-dep on dh-autoreconf and add --with autoreconf for dh.
+
+ -- Sven Hoexter <hoexter@debian.org>  Thu, 28 Apr 2011 09:22:04 +0200
+
 mysqltcl (3.05-4) unstable; urgency=low
 
   * According to dev-ref 6.2.2 the short description is no sentence so

diff --git a/debian/control b/debian/control
index 77396d1f2d9ca9bd4a57f119adab3f2c9cda59d2..e4fd668572f624b7e2cdbcdb404fbbbcdd6dee83 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: mysqltcl
 Section: database
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>
-Build-Depends: debhelper (>= 8), tcl-dev, libmysqlclient-dev, quilt
+Build-Depends: debhelper (>= 8), tcl-dev, libmysqlclient-dev, quilt,
+ dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://www.xdobry.de/mysqltcl/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/mysqltcl.git

diff --git a/debian/patches/series b/debian/patches/series
index a0ac2bf656468d58316af3e5be8fa8dd71e0b362..083e0996375cd0af207a3149d08b2c324ffb6070 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 man-section
+tcl.m4_gnu_non_linux_ld_settings

diff --git a/debian/patches/tcl.m4_gnu_non_linux_ld_settings b/debian/patches/tcl.m4_gnu_non_linux_ld_settings
new file mode 100644 (file)
index 0000000..f398156
--- /dev/null
+++ b/debian/patches/tcl.m4_gnu_non_linux_ld_settings
@@ -0,0 +1,27 @@
+Fix incomplete linker settings in tcl.m4 on non Linux
+but GNU systems which are not detected correctly.
+This is a problem on Debian GNU/kfreebsd and GNU/Hurd.
+Patch provided by Pino Toscano <toscano.pino@tiscali.it>.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624378
+
+To take effect we've to run autoreconf after the patch
+is applied.
+
+Forwarded upstream on 28.04.2011 via email.
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1475,11 +1475,11 @@ dnl AC_CHECK_TOOL(AR, ar)
+           SHLIB_SUFFIX=".so"
+ 
+           SHLIB_LD="${CC} -shared"
+-          DL_OBJS=""
++          DL_OBJS="tclLoadDl.o"
+           DL_LIBS="-ldl"
+           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+-          CC_SEARCH_FLAGS=""
+-          LD_SEARCH_FLAGS=""
++          CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++          LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+           if test "`uname -m`" = "alpha" ; then
+               CFLAGS="$CFLAGS -mieee"
+           fi

diff --git a/debian/rules b/debian/rules
index de1946d185ecdc28ebb1a6221e9e13f70b1faa17..a1d4952258d709541cb4c62543b98c0cf515db3c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-       dh $@ --with quilt
+       dh $@ --with quilt,autoreconf
 
 override_dh_auto_configure:
        dh_auto_configure -- \