[Pkg-sdl-commits] [SCM] Packaging of SDL_sound branch, master, updated. debian/1.0.3-5-3-g564cd98

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 564cd98c83d927495386d9d1c5d8a5366306575c
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue May 8 20:37:26 2012 +0100

    Preparing release -6 fixing FTBFS and others, see changelog for more info

diff --git a/debian/changelog b/debian/changelog
index 48cb75b..e60c7ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-sdl-sound1.2 (1.0.3-6) UNRELEASED; urgency=low
+sdl-sound1.2 (1.0.3-6) unstable; urgency=low
 
-  * Drop unnecessary dependencies of libsdl-sound1.2-dev.
+  [ Felix Geyer ]
+  * Drop unnecessary dependencies of libsdl-sound1.2-dev
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 19 Mar 2012 13:09:26 +0100
+  [ Manuel A. Fernandez Montecelo ]
+  * Add patch fix-FTBFS-libm-672012.patch to link against libm, fixing FTBFS bug
+    (Closes: #672012)
+  * Add ~ on build-depends for SDL, so it makes work easier for backporters
+  * Remove unused lintian override
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Tue, 08 May 2012 22:33:02 +0100
 
 sdl-sound1.2 (1.0.3-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 098149e..60ddc4f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 9~),
                dpkg-dev (>= 1.16.1~),
-               libsdl1.2-dev (>= 1.2.14),
+               libsdl1.2-dev (>= 1.2.14~),
                libflac-dev (>= 1.1.2),
                libsmpeg-dev (>= 0.4.5+cvs20030824),
                libmikmod-dev,
@@ -38,7 +38,7 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          libsdl-sound1.2 (= ${binary:Version}),
-         libsdl1.2-dev (>= 1.2.14)
+         libsdl1.2-dev (>= 1.2.14~)
 Description: Sound library for Simple DirectMedia Layer 1.2, development files
  SDL_sound is a library that handles the decoding of several popular sound file
  formats, such as .WAV and .MP3.  It is an add-on to Simple Directmedia Layer
diff --git a/debian/patches/fix-FTBFS-libm-672012.patch b/debian/patches/fix-FTBFS-libm-672012.patch
new file mode 100644
index 0000000..99f3863
--- /dev/null
+++ b/debian/patches/fix-FTBFS-libm-672012.patch
@@ -0,0 +1,17 @@
+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
+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@
diff --git a/debian/patches/series b/debian/patches/series
index 51b2dc0..d532df1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-FTBFS-libm-672012.patch
 modify-timidity-path.patch

-- 
Packaging of SDL_sound