Hi! As agreed during DebConf7, I've sponsored Andreas' NMU. It's just the patch, and the enabling of dpatch to handle the patch.
I'm attaching the interdiff output. -- Bezitos, Maggie.
diff -u stratagus-2.1/debian/changelog stratagus-2.1/debian/changelog --- stratagus-2.1/debian/changelog +++ stratagus-2.1/debian/changelog @@ -1,3 +1,14 @@ +stratagus (2.1-9.2) unstable; urgency=low + + * Non-Maintainer Upload (NMU) + * Add debian/patches/flac1113.dpatch to fix building with FLAC >= 1.1.13 + (Closes: #427755). + * Reenable the patch handling system: + - Enable the patch/unpatch dependency targets in debian/rules. + - Add build-dependency on dpatch. + + -- Andreas Henriksson <[EMAIL PROTECTED]> Thu, 14 Jun 2007 22:07:15 +0200 + stratagus (2.1-9.1) unstable; urgency=low * Non-maintainer upload. diff -u stratagus-2.1/debian/control stratagus-2.1/debian/control --- stratagus-2.1/debian/control +++ stratagus-2.1/debian/control @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: David MartÃnez Moreno <[EMAIL PROTECTED]> -Build-Depends: libglib1.2-dev, libx11-dev, libxt-dev, libsdl1.2-dev (>> 1.2.2), libvorbis-dev, libpng12-dev (>= 1.2.5), libbz2-dev, liblualib50-dev, debhelper (>> 4.0.0), libflac-dev +Build-Depends: libglib1.2-dev, libx11-dev, libxt-dev, libsdl1.2-dev (>> 1.2.2), libvorbis-dev, libpng12-dev (>= 1.2.5), libbz2-dev, liblualib50-dev, debhelper (>> 4.0.0), libflac-dev, dpatch Standards-Version: 3.6.2.2 Package: stratagus diff -u stratagus-2.1/debian/rules stratagus-2.1/debian/rules --- stratagus-2.1/debian/rules +++ stratagus-2.1/debian/rules @@ -26,14 +26,16 @@ #configure: patch configure-stamp configure: configure-stamp -configure-stamp-opengl: +configure-stamp-opengl: patch +#configure-stamp-opengl: dh_testdir ./configure --with-opengl $(CONFIGURE_FLAGS) touch configure-stamp-opengl -configure-stamp-no_opengl: +configure-stamp-no_opengl: patch +#configure-stamp-no_opengl: dh_testdir ./configure --without-opengl $(CONFIGURE_FLAGS) @@ -56,8 +58,8 @@ touch build-stamp-no_opengl -#clean: clean1 unpatch -clean: clean1 +clean: clean1 unpatch +#clean: clean1 clean1: dh_testdir only in patch2: unchanged: --- stratagus-2.1.orig/debian/patches/00list +++ stratagus-2.1/debian/patches/00list @@ -0,0 +1 @@ +flac1113 only in patch2: unchanged: --- stratagus-2.1.orig/debian/patches/flac1113.dpatch +++ stratagus-2.1/debian/patches/flac1113.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## flac1113.dpatch by Andreas Henriksson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix building with FLAC >= 1.1.13 + [EMAIL PROTECTED]@ + +--- stratagus-2.1/src/sound/flac.c 2004-06-26 01:22:33.000000000 +0200 ++++ stratagus-2.1-fixed/src/sound/flac.c 2007-06-13 21:16:28.000000000 +0200 +@@ -339,12 +339,15 @@ + sample->Pos = 0; + sample->User = data; + +- FLAC__stream_decoder_set_read_callback(stream, FLAC_read_callback); +- FLAC__stream_decoder_set_write_callback(stream, FLAC_write_callback); +- FLAC__stream_decoder_set_metadata_callback(stream, FLAC_metadata_callback); +- FLAC__stream_decoder_set_error_callback(stream, FLAC_error_callback); +- FLAC__stream_decoder_set_client_data(stream, sample); +- FLAC__stream_decoder_init(stream); ++ FLAC__stream_decoder_init_stream( ++ stream, ++ FLAC_read_callback, ++ NULL, NULL, NULL, NULL, ++ FLAC_write_callback, ++ FLAC_metadata_callback, ++ FLAC_error_callback, ++ (void*) sample ++ ); + + if (flags & PlayAudioStream) { + sample->Buffer = malloc(SOUND_BUFFER_SIZE);
signature.asc
Description: Digital signature