[pkg-lynx-commits] [lynx-cur] 01/03: Bump debhelper compatibility level to 10

[Axel Beckert]

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

abe pushed a commit to branch master
in repository lynx-cur.

commit 7c0516448877b16486080da40887c87f650e19f2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Oct 30 16:53:29 2017 +0100

    Bump debhelper compatibility level to 10
    
    Update versioned debhelper build-depency accordingly.
    
    Remove "--parallel" and "--with autotools" from debian/rules and drop
    build-depency on autotools-dev.
    
    Use dh_autoreconf with autoreconf-dickey, otherwise FTBFS. Add
    build-depency on autoconf-dickey for that.
    
    Also drop explicitly calling dh_update_autotools_config again. Now
    implicitly called.
---
 debian/changelog | 8 ++++++--
 debian/compat    | 2 +-
 debian/control   | 3 ++-
 debian/rules     | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e8e504..dc0484f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ lynx (2.8.9dev16-2) UNRELEASED; urgency=low
 
   [ Axel Beckert ]
   * Set "Rules-Requires-Root: no".
-  * Use "dh_update_autotools_config" instead of "--with autotools".
-    + Drop build-dependency on autotools-dev.
+  * Bump debhelper compatibility level to 10.
+    + Update versioned debhelper build-depency accordingly.
+    + Remove "--parallel" and "--with autotools" from debian/rules.
+    + Drop build-depency on autotools-dev.
+    + Use dh_autoreconf with autoreconf-dickey, otherwise FTBFS.
+      - Add build-depency on autoconf-dickey.
   * Drop transitional package lynx-cur.
   * Switch Homepage, debian/copyright Source and debian/watch to HTTPS.
   * Remove ftp:// URL from debian/copyright (but leave it as comment in
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c727ee5..e8c3dc9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders: Axel Beckert <abe at debian.org>,
            Andy Valencia <lynxomatic at gmail.com>,
            Elimar Riesebieter <riesebie at lxtec.de>
 Homepage: https://lynx.invisible-island.net/
-Build-Depends: debhelper (>= 9),
+Build-Depends: autoconf-dickey,
+               debhelper (>= 10),
                gettext,
                libbsd-dev,
                libbz2-dev,
diff --git a/debian/rules b/debian/rules
index 21b56e0..f65ea3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ else
 	sed -i -e s/libgnutls28-dev/libssl-dev/g debian/control
 endif
 
-	dh_update_autotools_config
 	env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \
 	COMPRESS=/usr/bin/compress BZIP2=/bin/bzip2 UNZIP=/usr/bin/unzip \
 	ZIP=/usr/bin/zip \
@@ -39,6 +38,8 @@ endif
 	--with-screen=ncursesw --enable-justify-elts \
 	$(CONFTLS)
 
+override_dh_autoreconf:
+	dh_autoreconf autoreconf-dickey -- -f -i
 
 override_dh_auto_install:
 	dh_auto_install --verbose -- install-full
@@ -51,4 +52,4 @@ override_dh_link:
 	dh_link
 
 %:
-	dh $@ --parallel
+	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git