Hi, attached is the diff for a freecraft 1:1.18-3.1 NMU.
It fixes the following bugs: #404223 freecraft: FTBFS on GNU/kFreeBSD: wrong OS detection #454305 freecraft: fails to compile with noopt #483456 freecraft: Please use libsvga1-dev instead in Build-Depends Please consider closing bug #499336 (freecraft: should this package be removed?) using a mail to bugnumber-d...@bugs.debian.org if you are still interested in maintaining freecraft since there is no need to remove a well maintained package. I will probably not really do a NMU, if you are actively maintaining this package I will wait for you to make the maintainer upload and if you are not I will ask for removal. Please note that I did not enable linking against libsvga on amd64 as suggested in #483456 since this should be the decision of the maintainer although I think this should be done after it has been tested. Regards Carsten
diff -u freecraft-1.18/debian/changelog freecraft-1.18/debian/changelog --- freecraft-1.18/debian/changelog +++ freecraft-1.18/debian/changelog @@ -1,3 +1,14 @@ +freecraft (1:1.18-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Depend on libsvga1-dev instead of svgalibg1-dev. (Closes: #483456) + * Don't detect warnings as errors when built with DEB_BUILD_OPTIONS=noopt. + (Closes: #454305) + * Fix FTBFS on GNU/kFreeBSD. Thanks to Cyril Brulebois for the patch. + (Closes: #404223) + + -- Carsten Hey <c....@web.de> Sat, 27 Dec 2008 22:45:12 +0100 + freecraft (1:1.18-3) unstable; urgency=low * New maintainer. diff -u freecraft-1.18/debian/control freecraft-1.18/debian/control --- freecraft-1.18/debian/control +++ freecraft-1.18/debian/control @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Lincoln de Sousa <linc...@minaslivre.org> -Build-Depends: libglib1.2-dev, libx11-dev, libxext-dev, libsdl1.2-dev (>> 1.2.2), libsdl1.2debian, libpng12-dev, svgalibg1-dev [i386], libbz2-dev, debhelper (>> 4.0.0) +Build-Depends: libglib1.2-dev, libx11-dev, libxext-dev, libsdl1.2-dev (>> 1.2.2), libsdl1.2debian, libpng12-dev, libsvga1-dev [i386], libbz2-dev, debhelper (>> 4.0.0) Standards-Version: 3.8.0 Package: freecraft diff -u freecraft-1.18/debian/patches/00list freecraft-1.18/debian/patches/00list --- freecraft-1.18/debian/patches/00list +++ freecraft-1.18/debian/patches/00list @@ -8,0 +9,2 @@ +18_os_detection_kfreebsd_fix +19_dont_detect_warnings_as_errors only in patch2: unchanged: --- freecraft-1.18.orig/debian/patches/19_dont_detect_warnings_as_errors.dpatch +++ freecraft-1.18/debian/patches/19_dont_detect_warnings_as_errors.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh -e +## 19_dont_detect_warnings_as_errors.dpatch by Carsten Hey <c....@web.de> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't detect warnings as errors when built with DEB_BUILD_OPTIONS=noopt. + +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 -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *)¬ + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +--- setup 2008-12-27 19:10:51.000000000 +0100 ++++ setup 2008-12-27 19:12:12.015384272 +0100 +@@ -131,7 +131,7 @@ + + # Choose optimization level + #DEBUG_CFLAGS="-g -O0 -fsigned-char \$(PROFILE) -pipe -Wall -Werror \$(IFLAGS) \$(DFLAGS)" +-DEBUG_CFLAGS="-g -O1 -fsigned-char -Wall -Werror \$(IFLAGS) \$(DFLAGS)" ++DEBUG_CFLAGS="-g -O1 -fsigned-char -Wall \$(IFLAGS) \$(DFLAGS)" + #-- Production (default) + CFLAGS="-O2 -pipe -fsigned-char -fomit-frame-pointer -fconserve-space -fexpensive-optimizations -ffast-math \$(IFLAGS) \$(DFLAGS)" + #-- High Optimization only in patch2: unchanged: --- freecraft-1.18.orig/debian/patches/18_os_detection_kfreebsd_fix.dpatch +++ freecraft-1.18/debian/patches/18_os_detection_kfreebsd_fix.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh -e +## 18_os_detection_kfreebsd_fix.dpatch by Carsten Hey <c....@web.de> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't detect GNU/kFreeBSD as BSD. + +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 -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *)¬ + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +--- setup 2003-03-12 05:03:35.000000000 +0100 ++++ setup 2008-12-27 19:08:36.377804601 +0100 +@@ -108,13 +108,13 @@ + CC=gcc + CCLD=$CC + RM="rm -f" +-if [ "`uname -a | grep -is bsd` x" != " x" ] ; then ++if [ "`uname -a | grep -v 'GNU/kFreeBSD' | grep -is bsd` x" != " x" ] ; then + MAKE=gmake + EXTRA_CFLAGS="$EXTRA_CFLAGS -DBSD" + else + MAKE=make + fi +-if [ "`uname -a | grep -is bsd` x" != " x" ] ; then ++if [ "`uname -a | grep -v 'GNU/kFreeBSD' | grep -is bsd` x" != " x" ] ; then + DL= + else + DL=-ldl +@@ -419,7 +419,7 @@ + echo "Checking for various video libraries..." + + # Check for SDL >= 1.x +-if [ "`uname -a | grep -is bsd` x" != " x" ] ; then ++if [ "`uname -a | grep -v 'GNU/kFreeBSD' | grep -is bsd` x" != " x" ] ; then + SDL_CONFIG=sdl11-config + else + SDL_CONFIG=sdl-config +@@ -600,7 +600,7 @@ + case $ANSWER2 in + [yY]) + echo "THREAD = -D_REENTRANT -DUSE_THREAD" >> $RULESFILE +- if [ "`uname -a | grep -is bsd x` " != " x" ] ; then ++ if [ "`uname -a | grep -v 'GNU/kFreeBSD' | grep -is bsd x` " != " x" ] ; then + echo "THREADLIB = -pthread" >> $RULESFILE + else + echo "THREADLIB = -lpthread" >> $RULESFILE
