[Pkg-sdl-commits] [SCM] Packaging of SDL_ttf branch, master, updated. debian/2.0.9-1.1-15-g7fe2cd8

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 4e33754d4e7c27e46edebb35da81a18b46e686a1
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 27 12:44:57 2012 +0000

    Fix the missing -lm as patch of Makefile.am (not .in), because it gets rebuilt

diff --git a/debian/patches/bug_556340_ftbfs-with-binutils-gold b/debian/patches/bug_556340_ftbfs-with-binutils-gold
deleted file mode 100644
index 9ab2ec6..0000000
--- a/debian/patches/bug_556340_ftbfs-with-binutils-gold
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -68,7 +68,7 @@
- 	"$(DESTDIR)$(libSDL_ttfincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libSDL_ttf_la_LIBADD =
-+libSDL_ttf_la_LIBADD = -lm
- am_libSDL_ttf_la_OBJECTS = SDL_ttf.lo
- libSDL_ttf_la_OBJECTS = $(am_libSDL_ttf_la_OBJECTS)
- libSDL_ttf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
diff --git a/debian/patches/link_libm_ftbfs_binutils-gold b/debian/patches/link_libm_ftbfs_binutils-gold
new file mode 100644
index 0000000..c434097
--- /dev/null
+++ b/debian/patches/link_libm_ftbfs_binutils-gold
@@ -0,0 +1,16 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,6 +36,13 @@
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ endif
+ 
++# Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
++#
++# 20120127
++# Fix for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556340
++# FTBFS with binutils-gold
++libSDL_ttf_la_LDFLAGS += -lm
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = SDL_ttf.pc
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 478e465..fab08e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-bug_556340_ftbfs-with-binutils-gold
+link_libm_ftbfs_binutils-gold

-- 
Packaging of SDL_ttf