diff -Nru opencity-0.0.6.3stable/debian/changelog opencity-0.0.6.3stable/debian/changelog --- opencity-0.0.6.3stable/debian/changelog 2011-03-11 19:40:48.000000000 +0530 +++ opencity-0.0.6.3stable/debian/changelog 2011-06-30 09:36:38.000000000 +0530 @@ -1,3 +1,10 @@ +opencity (0.0.6.3stable-1ubuntu1) oneiric; urgency=low + + * Added debian/patches/01-fix-ftbfs. (LP: #771091) + - Fixes FTBFS from --as-needed linker change + + -- Nigel Babu Thu, 30 Jun 2011 02:23:34 +0530 + opencity (0.0.6.3stable-1) UNRELEASED; urgency=low * New upstream version diff -Nru opencity-0.0.6.3stable/debian/control opencity-0.0.6.3stable/debian/control --- opencity-0.0.6.3stable/debian/control 2011-03-11 19:39:43.000000000 +0530 +++ opencity-0.0.6.3stable/debian/control 2011-06-30 02:26:03.000000000 +0530 @@ -1,7 +1,8 @@ Source: opencity Section: games Priority: optional -Maintainer: Debian Games Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Games Team Uploaders: Christoph Egger Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl1.2-dev, diff -Nru opencity-0.0.6.3stable/debian/patches/01-move-libs-to-LIBS opencity-0.0.6.3stable/debian/patches/01-move-libs-to-LIBS --- opencity-0.0.6.3stable/debian/patches/01-move-libs-to-LIBS 1970-01-01 05:30:00.000000000 +0530 +++ opencity-0.0.6.3stable/debian/patches/01-move-libs-to-LIBS 2011-06-30 09:38:07.000000000 +0530 @@ -0,0 +1,52 @@ +# Description: Fix FTBFS due to --as-needed change +# Author: Nigel Babu +# Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/opencity/+bug/771091 +# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632147 +# Bug: https://sourceforge.net/tracker/?func=detail&atid=556865&aid=3344653&group_id=79520 +--- a/configure ++++ b/configure +@@ -4373,7 +4373,7 @@ + + + CXXFLAGS="$SDL_CFLAGS" +-LDFLAGS="$LDFLAGS $SDL_LIBS" ++LIBS="$LIBS $SDL_LIBS" + + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -5701,7 +5701,7 @@ + + if test "x$SDL_mixer_h" = "xyes"; then + if test "x$SDL_mixer_lib" = "xyes"; then +- LDFLAGS="$LDFLAGS -lSDL_mixer" ++ LIBS="$LIBS -lSDL_mixer" + + cat >>confdefs.h <<\_ACEOF + #define OPENCITY_SDL_MIXER 1 +@@ -5787,7 +5787,7 @@ + + + if test "x$enable_mingw" = "xyes"; then +- LDFLAGS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LDFLAGS" ++ LIBS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LIBS" + else + + { $as_echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5 +@@ -6121,7 +6121,7 @@ + for PNG in png png12 png13 dummypng; do + if $PACKAGE_CONFIG --exists lib$PNG > /dev/null 2>&1 ; then + CXXFLAGS="$CXXFLAGS `$PACKAGE_CONFIG --cflags lib$PNG`" +- LDFLAGS="$LDFLAGS `$PACKAGE_CONFIG --libs lib$PNG`" ++ LIBS="$LIBS `$PACKAGE_CONFIG --libs lib$PNG`" + break + fi + done +@@ -6143,7 +6143,7 @@ + + CXXFLAGS="-std=c++98 $CXXFLAGS" + +-LDFLAGS="-L$with_gl_prefix/lib $enable_gprof $LDFLAGS" ++LIBS="-L$with_gl_prefix/lib $enable_gprof $LIBS" + + + diff -Nru opencity-0.0.6.3stable/debian/patches/series opencity-0.0.6.3stable/debian/patches/series --- opencity-0.0.6.3stable/debian/patches/series 2011-03-11 19:39:43.000000000 +0530 +++ opencity-0.0.6.3stable/debian/patches/series 2011-06-30 09:52:48.000000000 +0530 @@ -1 +1,2 @@ +01-move-libs-to-LIBS