Hi! I'm currently preparing an NMU for freecraft to fix bug #377991 (FTBFS because of problems linking to libX11).
The diff between 1.18-2.2 and 1.18-2.3 is attached. -- Kind regards, +--------------------------------------------------------------------+ | Bas Zoetekouw | GPG key: 0644fab7 | |----------------------------| Fingerprint: c1f5 f24c d514 3fec 8bf6 | | [EMAIL PROTECTED], [EMAIL PROTECTED] | a2b1 2bae e41f 0644 fab7 | +--------------------------------------------------------------------+
diff -Naur /tmp/freecraft-1.18/debian/changelog freecraft-1.18/debian/changelog --- /tmp/freecraft-1.18/debian/changelog 2006-07-19 17:27:26.000000000 +0200 +++ freecraft-1.18/debian/changelog 2006-07-19 17:14:10.000000000 +0200 @@ -1,3 +1,11 @@ +freecraft (1:1.18-2.3) unstable; urgency=medium + + * Non-maintainer upload + * Fixed linking against libX11 [15_x11_linking.dpatch] + (closes: #377991) + + -- Bas Zoetekouw <[EMAIL PROTECTED]> Wed, 19 Jul 2006 16:02:36 +0200 + freecraft (1:1.18-2.2) unstable; urgency=low * Non-maintainer upload to solve build problems. diff -Naur /tmp/freecraft-1.18/debian/patches/00list freecraft-1.18/debian/patches/00list --- /tmp/freecraft-1.18/debian/patches/00list 2006-07-19 17:27:26.000000000 +0200 +++ freecraft-1.18/debian/patches/00list 2006-07-19 17:14:10.000000000 +0200 @@ -3,3 +3,4 @@ 12_debian_no_TSC_counter 13_debian_repackaging_glitches 14_debian_amd64_gcc4 +15_x11_linking diff -Naur /tmp/freecraft-1.18/debian/patches/15_x11_linking.dpatch freecraft-1.18/debian/patches/15_x11_linking.dpatch --- /tmp/freecraft-1.18/debian/patches/15_x11_linking.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ freecraft-1.18/debian/patches/15_x11_linking.dpatch 2006-07-19 17:27:03.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/sh +## 15_x11_linking.dpatch by Bas Zoetekouw <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix linking against libX11 (bug #377991) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +diff -urN freecraft-1.18/setup freecraft-1.18/setup +--- freecraft-1.18/setup 2003-03-12 05:03:35.000000000 +0100 ++++ ../freecraft-1.18/setup 2006-07-18 15:54:13.000000000 +0200 +@@ -1059,10 +1059,10 @@ + if [ "$BEOS" != 1 ] ; then + if [ "$DARWIN" != 1 ] ; then + # Libraries needed to build tools +- echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz -lm \$(THREADLIB)" >> $RULESFILE ++ echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz -lm -lX11 \$(THREADLIB)" >> $RULESFILE + + # Libraries needed to build freecraft +- echo "CLONELIBS=$CLONELIBS \$(XLDFLAGS) -lpng -lz -lm \\" >> $RULESFILE ++ echo "CLONELIBS=$CLONELIBS \$(XLDFLAGS) -lpng -lz -lm -lX11 \\" >> $RULESFILE + echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS) \\" >> $RULESFILE + echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) -lz -lm" >> $RULESFILE + else
