[Pkg-sdl-commits] [sdl-sound1.2] 01/02: Use dh-autoreconf to improve the ./configure step

[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 sdl-sound1.2.

commit e34ecdd9edb6ccb7d579865ac97e3cdf2534f436
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Mon Oct 28 21:52:54 2013 +0000

    Use dh-autoreconf to improve the ./configure step
---
 debian/changelog                           |   12 ++++++++++++
 debian/control                             |    6 +++---
 debian/patches/fix-FTBFS-libm-672012.patch |   24 ++++++++++++------------
 debian/rules                               |   11 +++++++----
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e60c7ca..7a3fce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sdl-sound1.2 (1.0.3-7) UNRELEASED; urgency=low
+
+  * Bump Standards-Version to 3.9.4 (no changes needed)
+  * Use dh-autoreconf (Closes: #702978, #727964).  Thanks Daniel Schepler
+    and Matthias Klose.
+  * Modity fix-FTBFS-libm-672012.patch to enable the extra flag to link
+    with libm in Makefile.am, rather than .in (thanks Daniel Schepler for
+    the suggestion)
+  * Use @debian address for maintainer
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Mon, 28 Oct 2013 21:55:05 +0000
+
 sdl-sound1.2 (1.0.3-6) unstable; urgency=low
 
   [ Felix Geyer ]
diff --git a/debian/control b/debian/control
index 60ddc4f..dca7170 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: sdl-sound1.2
 Section: libs
 Priority: optional
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
-DM-Upload-Allowed: yes
-Standards-Version: 3.9.3
+Uploaders: Manuel A. Fernandez Montecelo <mafm at debian.org>
+Standards-Version: 3.9.4
 Build-Depends: debhelper (>= 9~),
                dpkg-dev (>= 1.16.1~),
+               dh-autoreconf,
                libsdl1.2-dev (>= 1.2.14~),
                libflac-dev (>= 1.1.2),
                libsmpeg-dev (>= 0.4.5+cvs20030824),
diff --git a/debian/patches/fix-FTBFS-libm-672012.patch b/debian/patches/fix-FTBFS-libm-672012.patch
index 99f3863..53e02f2 100644
--- a/debian/patches/fix-FTBFS-libm-672012.patch
+++ b/debian/patches/fix-FTBFS-libm-672012.patch
@@ -2,16 +2,16 @@ Description: Fix FTBFS with GCC-4.7
  Adding quick fix to link against the math library, which for some reason seems
  to be missing when using GCC-4.7
 Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
-Last-Update: 2012-05-08
+Last-Update: 2013-10-26
 Bug-Debian: http://bugs.debian.org/672012
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -143,7 +143,7 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INTERFACE_AGE = @INTERFACE_AGE@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lm
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -32,7 +32,7 @@
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libSDL_sound_la_LIBADD =	\
+ 	decoders/libdecoders.la	\
+-	$(TIMIDITY_LIB) $(MPGLIB_LIB)
++	$(TIMIDITY_LIB) $(MPGLIB_LIB) -lm
+ 
+ EXTRA_DIST =	\
+ 	CREDITS \
diff --git a/debian/rules b/debian/rules
index f14fa26..b3dfb37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,12 @@
 #export DH_VERBOSE=1
 
 
-export DEB_CFLAGS_MAINT_APPEND = -pipe -Wall
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND  := -pipe -Wall
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-undefined -Wl,--as-needed
 
 
 # document what's actually used
-confflags  = --enable-voc
+confflags := --enable-voc
 confflags += --enable-wav
 confflags += --enable-raw
 confflags += --enable-aiff
@@ -28,7 +28,10 @@ confflags += --disable-altcvt
 
 
 %:
-	dh $@ --parallel
+	dh $@ --with autoreconf --parallel
+
+override_dh_autoreconf:
+	AUTOMAKE="automake --foreign" dh_autoreconf --as-needed
 
 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/sdl-sound1.2.git