[libdap] 17/48: WIP: test --as-needed fix

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 78c6229ede271a3a31e54d27ddf1afd9f4665abd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Dec 7 13:40:26 2011 +0000

    WIP: test --as-needed fix
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 10 +++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dd057f..fea83c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdap (3.11.1-10) unstable; urgency=low
+
+  * Switch to dh_autoreconf --as-needed for ltmain-as-needed instead of
+    patching manually. Thanks to Iain Lane. Closes: #651285.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 07 Dec 2011 12:59:35 +0000
+
 libdap (3.11.1-9) unstable; urgency=low
 
   * Rewrite dap-config to call pkg-config, to work correctly with 
diff --git a/debian/control b/debian/control
index bcf2411..56646e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libdap
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: zlib1g-dev, debhelper (>= 7.0.50~), pkg-config, libxml2-dev, libcurl4-gnutls-dev , dejagnu, doxygen, graphviz, 
+Build-Depends: zlib1g-dev, debhelper (>= 8.1.3~), pkg-config, libxml2-dev, libcurl4-gnutls-dev , dejagnu, doxygen, graphviz, dh-autoreconf (>= 4)
  autoconf, automake, libtool, flex, bison, uuid-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.2
diff --git a/debian/rules b/debian/rules
index df596b2..a9d85a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,16 @@ LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # The magic debhelper rule:
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 
-override_dh_auto_configure:
+override_dh_autoreconf:
 	# remove out of date files
 	rm -f conf/config.guess conf/config.sub
-	# Patch libtool to fix as-needed brokenness. _After_ updating libtool.
 	libtoolize -c -f
-	autoreconf -fi
-	(cd conf && patch < ../debian/as-needed.patch)
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
 	LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- --with-gnu-ld
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git