[Pkg-sdl-commits] [libsdl1.2] 02/03: Use "dh_autoreconf --as-needed" in debian/rules without calling ./autogen.sh (Closes: #735253)

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to branch master
in repository libsdl1.2.

commit 887f50bf427ed904ee19f616881bf4a4cdd95165
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Mar 8 23:36:04 2014 +0000

    Use "dh_autoreconf --as-needed" in debian/rules without calling ./autogen.sh (Closes: #735253)
---
 debian/changelog |  5 +++++
 debian/control   |  1 -
 debian/rules     | 28 ++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2e7864..3b37f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 libsdl1.2 (1.2.15-9) UNRELEASED; urgency=medium
 
   * Bump Policy Standards-Version to 3.9.5 (no changes needed)
+  * Use dh_autoreconf in debian/rules without calling ./autogen.sh and
+    perform other tricks to actually support new architectures (arm64,
+    powerpc64le, ...) (Closes: #735253)
+  * Do not build-depend on autotools-dev, dh-autoreconf is supposed to
+    supersede it
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sat, 08 Mar 2014 23:27:39 +0000
 
diff --git a/debian/control b/debian/control
index 577c6f1..58fdc12 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders: Barry deFreese <bdefreese at debian.org>,
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               autotools-dev,
                dpkg-dev (>= 1.16.1~),
                nasm [any-i386],
                libx11-dev, 
diff --git a/debian/rules b/debian/rules
index dec4179..722a19d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,34 @@ endif
 
 
 %:
-	dh $@ --with autoreconf,autotools-dev --parallel
+	dh $@ --with autoreconf --parallel
 
 override_dh_autoreconf:
-	dh_autoreconf --as-needed ./autogen.sh
+        # aclocal needs to include in specific order, and/or it seems that
+        # doesn't try to find .m4 files in /usr/share/aclocal at all.  Updates
+        # to both .m4 files and ltmain.sh (aclocal and libtoolize) are necessary
+        # to support new architectures aarch64 (arm64) and powerpc64le, and this
+        # seems the more straight way to achieve it.
+        #
+        # An alternative would be to just build-depend on libesd0-dev,
+        # libasound2-dev and libltdl-dev to provide the files "esd.m4 alsa.m4
+        # ltdl.m4" in /usr/share/aclocal, and not use the local "acinclude" dir
+        # at all, but this pull even more dependencies, and unneeded ones.
+        #
+        # Another equivalent alternative, but more verbose:
+        #
+        # ACLOCAL="cat acinclude/esd.m4 acinclude/alsa.m4 acinclude/ltdl.m4 \
+        #           /usr/share/aclocal/libtool.m4 \
+        #           /usr/share/aclocal/ltoptions.m4 \
+        #           /usr/share/aclocal/ltversion.m4 \
+        #           /usr/share/aclocal/ltsugar.m4 >> aclocal.m4; aclocal"
+        #          LIBTOOLIZE="libtoolize -f -i" dh_autoreconf --as-needed
+        #          autoreconf -- -I acinclude -f -i
+	AUTOHEADER=true ACLOCAL="aclocal --force --install -I /usr/share/aclocal/ -I acinclude" LIBTOOLIZE="libtoolize -fi" dh_autoreconf --as-needed
+        # To verify that it worked, grep should find these strings:
+        #
+        #rgrep -i aarch64 .
+        #rgrep -r powerpc64le .
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(confflags)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl1.2.git