diffstat for xqf_1.0.5-2 xqf_1.0.5-2ubuntu1 debian/patches/51_fix_ftbfs_binutils_gold.patch | 29 ++++++++++++++++++++++++ xqf-1.0.5/debian/changelog | 8 ++++++ xqf-1.0.5/debian/control | 3 +- xqf-1.0.5/debian/patches/series | 1 4 files changed, 40 insertions(+), 1 deletion(-) diff -u xqf-1.0.5/debian/control xqf-1.0.5/debian/control --- xqf-1.0.5/debian/control +++ xqf-1.0.5/debian/control @@ -1,7 +1,8 @@ Source: xqf Section: games Priority: optional -Maintainer: Jordi Mallach +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jordi Mallach Standards-Version: 3.8.3 Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, diff -u xqf-1.0.5/debian/changelog xqf-1.0.5/debian/changelog --- xqf-1.0.5/debian/changelog +++ xqf-1.0.5/debian/changelog @@ -1,3 +1,11 @@ +xqf (1.0.5-2ubuntu1) natty; urgency=low + + * debian/patches/51_fix_ftbfs_binutils_gold.patch: + + Fix FTBFS binutils-gold with ld --no-add-needed by adding X11 + library in src/Makefile.* (LP: #703478) + + -- Mahyuddin Susanto Sun, 16 Jan 2011 13:50:26 +0700 + xqf (1.0.5-2) unstable; urgency=low * Update to debhelper v7. diff -u xqf-1.0.5/debian/patches/series xqf-1.0.5/debian/patches/series --- xqf-1.0.5/debian/patches/series +++ xqf-1.0.5/debian/patches/series @@ -7,0 +8 @@ +51_fix_ftbfs_binutils_gold.patch only in patch2: unchanged: --- xqf-1.0.5.orig/debian/patches/51_fix_ftbfs_binutils_gold.patch +++ xqf-1.0.5/debian/patches/51_fix_ftbfs_binutils_gold.patch @@ -0,0 +1,29 @@ +Description: Fix FTBFS with ld --no-add-needed by adding X11 library linker +Author: Mahyuddin Susanto +Bug-Ubuntu: https://bugs.launchpad.net/bugs/703478 +Bug-Debian: http://bugs.debian.org/556722 + +diff -Nur -x '*.orig' -x '*~' xqf-1.0.5/src/Makefile.am xqf-1.0.5.new/src/Makefile.am +--- xqf-1.0.5/src/Makefile.am 2011-01-16 13:43:53.853828977 +0700 ++++ xqf-1.0.5.new/src/Makefile.am 2011-01-16 13:32:58.625332000 +0700 +@@ -32,7 +32,7 @@ + $(GEOIP_LIB) \ + $(PACKAGE_LIBS) \ + $(GDK_PIXBUF_LIBS) \ +- -lz ++ -lz -lX11 + + xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map + +diff -Nur -x '*.orig' -x '*~' xqf-1.0.5/src/Makefile.in xqf-1.0.5.new/src/Makefile.in +--- xqf-1.0.5/src/Makefile.in 2011-01-16 13:43:57.297831637 +0700 ++++ xqf-1.0.5.new/src/Makefile.in 2011-01-16 13:33:41.481331000 +0700 +@@ -311,7 +311,7 @@ + $(GEOIP_LIB) \ + $(PACKAGE_LIBS) \ + $(GDK_PIXBUF_LIBS) \ +- -lz ++ -lz -lX11 + + xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map +