[fenix-plugins] 10/10: Switch to dh-autoreconf.

[Peter Pentchev]

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

roam-guest pushed a commit to branch master
in repository fenix-plugins.

commit 1c839d74c6a3091a557d63e7721c7ecb4932cd36
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Dec 27 00:37:16 2015 +0200

    Switch to dh-autoreconf.
---
 debian/autoreconf | 11 +++++++++++
 debian/changelog  |  2 ++
 debian/control    |  5 ++---
 debian/rules      | 12 ++----------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/debian/autoreconf b/debian/autoreconf
new file mode 100644
index 0000000..6196910
--- /dev/null
+++ b/debian/autoreconf
@@ -0,0 +1,11 @@
+agua-1.0
+exec-0.4a
+fgfx-1.0
+fire-1.0
+fsock-1.0
+image-1.0
+mixer-1.0
+mpeg-1.0
+net-1.0
+tcpsock-2.0
+ttf-1.0
diff --git a/debian/changelog b/debian/changelog
index 2932091..4b58f17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ fenix-plugins (0.0.20070803-6) UNRELEASED; urgency=medium
   * Turn on all the build hardening features.
   * Add a Lintian override for a hardening false positive - the compiler
     is smart enough to realize that the calls are perfectly safe.
+  * Switch to dh-autoreconf, but keep autotools-dev just in case it is
+    needed for updating the config.* files on some architectures.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 21 Dec 2015 16:25:27 +0200
 
diff --git a/debian/control b/debian/control
index 65fb6bf..7cb1896 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,9 @@ Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>,
  Peter Pentchev <roam at ringlet.net>
-Build-Depends: debhelper (>= 9), autotools-dev,
- autoconf, automake,
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf,
  zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev,
- libsmpeg-dev, libfreetype6-dev, fenix, fenix-dev, libtool
+ libsmpeg-dev, libfreetype6-dev, fenix, fenix-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/fenix-plugins.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/fenix-plugins.git
diff --git a/debian/rules b/debian/rules
index 20103b5..e278b81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,15 +20,7 @@ PLUGINS = \
 	plugins/tcpsock.so plugins/fsock.so
 
 override_dh_auto_build:
-	for i in */ ; do \
-		if [ -e "$$i/configure.ac" ]; then \
-			cp -f /usr/share/libtool/config/ltmain.sh "$$i/ltmain.sh" ; \
-		fi \
-	done
-	dh_auto_build -- \
-		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-		CONFFLAGS="--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)" \
-		$(PLUGINS)
+	dh_auto_build -- $(PLUGINS)
 
 override_dh_auto_clean:
 	dh_auto_clean -- fullclean
@@ -36,4 +28,4 @@ override_dh_auto_clean:
 override_dh_makeshlibs:
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --with autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix-plugins.git