diff -u smc-1.9/debian/control smc-1.9/debian/control --- smc-1.9/debian/control +++ smc-1.9/debian/control @@ -1,7 +1,8 @@ Source: smc Section: games Priority: optional -Maintainer: Muammar El Khatib +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Muammar El Khatib Build-Depends: cdbs, debhelper (>= 6), autotools-dev, libcegui-mk2-dev (>= 0.6.2), libboost-filesystem-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, pkg-config, dpatch, ttf-dejavu Standards-Version: 3.8.4 Homepage: http://www.secretmaryo.org diff -u smc-1.9/debian/changelog smc-1.9/debian/changelog --- smc-1.9/debian/changelog +++ smc-1.9/debian/changelog @@ -1,3 +1,11 @@ +smc (1.9-3ubuntu1) natty; urgency=low + + * debian/patches/02_fix_ftbfs_binutils-gold.dpatch: fix FTBFS binutils-gold + with ld --no-add-needed by adding X11 libx and boost_system lib in + src/Makefile.in. (LP: #706777) + + -- Mahyuddin Susanto Mon, 24 Jan 2011 11:39:49 +0700 + smc (1.9-3) unstable; urgency=low * Bumped standards version to 3.8.4. No changes were needed in order to diff -u smc-1.9/debian/patches/00list smc-1.9/debian/patches/00list --- smc-1.9/debian/patches/00list +++ smc-1.9/debian/patches/00list @@ -1,0 +2 @@ +02_fix_ftbfs_binutils-gold only in patch2: unchanged: --- smc-1.9.orig/debian/patches/02_fix_ftbfs_binutils-gold.dpatch +++ smc-1.9/debian/patches/02_fix_ftbfs_binutils-gold.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_ftbfs_binutils-gold.dpatch by Mahyuddin Susanto +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS binutils-gold with ld --no-add-needed +## Bug-Ubuntu: https://launchpad.net/bugs/706777 +## Bug-Debian: http://bugs.debian.org/556349 + +@DPATCH@ +diff -Nurp smc-1.9/src/Makefile.in smc-1.9.ubuntu/src/Makefile.in +--- smc-1.9/src/Makefile.in 2009-08-17 23:00:49.000000000 +0700 ++++ smc-1.9.ubuntu/src/Makefile.in 2011-01-24 11:14:32.530172208 +0700 +@@ -78,7 +78,7 @@ am_smc_OBJECTS = audio.$(OBJEXT) random_ + font.$(OBJEXT) gl_surface.$(OBJEXT) img_manager.$(OBJEXT) \ + img_settings.$(OBJEXT) renderer.$(OBJEXT) video.$(OBJEXT) + smc_OBJECTS = $(am_smc_OBJECTS) +-smc_LDADD = $(LDADD) ++smc_LDADD = $(LDADD) -lX11 -lboost_system + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles