Control: tags -1 patch Hi,
please find attached a patch that fixes both release critical bugs. Regards, Markus
diff -Nru pinball-0.3.1/debian/changelog pinball-0.3.1/debian/changelog --- pinball-0.3.1/debian/changelog 2011-09-22 22:18:40.000000000 +0200 +++ pinball-0.3.1/debian/changelog 2014-08-03 23:07:26.000000000 +0200 @@ -1,3 +1,15 @@ +pinball (0.3.1-13.2) unstable; urgency=medium + + * Non-maintainer upload. + * Build-depend on libtiff-dev instead of libtiff4-dev because the latter is + going to disappear soon. (Closes: #736039) + * Add missing-separators.patch. + - Replace spaces with TABS in Makefiles and thus fix a FTBFS with newer + versions of GNU Make which are less fault tolerant. Thanks to Michael + Tautschnig for the report. (Closes: #750082) + + -- Markus Koschany <a...@gambaru.de> Sun, 03 Aug 2014 23:00:04 +0200 + pinball (0.3.1-13.1) unstable; urgency=low * Non-maintainer upload. diff -Nru pinball-0.3.1/debian/control pinball-0.3.1/debian/control --- pinball-0.3.1/debian/control 2010-05-17 18:24:18.000000000 +0200 +++ pinball-0.3.1/debian/control 2014-08-03 23:07:26.000000000 +0200 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Jochen Friedrich <joc...@scram.de> -Build-Depends: debhelper (>= 7.0.50~), libgl1-mesa-dev, libpng-dev, libsdl1.2-dev, freeglut3-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libogg-dev, libvorbis-dev, sp, sgmlspl, docbook, docbook-utils, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtiff4-dev, autoconf, automake, libtool, libltdl-dev (>= 2.2.6b) +Build-Depends: debhelper (>= 7.0.50~), libgl1-mesa-dev, libpng-dev, libsdl1.2-dev, freeglut3-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libogg-dev, libvorbis-dev, sp, sgmlspl, docbook, docbook-utils, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtiff-dev, autoconf, automake, libtool, libltdl-dev (>= 2.2.6b) Standards-Version: 3.8.4 Package: pinball diff -Nru pinball-0.3.1/debian/patches/missing-separators.patch pinball-0.3.1/debian/patches/missing-separators.patch --- pinball-0.3.1/debian/patches/missing-separators.patch 1970-01-01 01:00:00.000000000 +0100 +++ pinball-0.3.1/debian/patches/missing-separators.patch 2014-08-03 23:07:26.000000000 +0200 @@ -0,0 +1,101 @@ +From: Markus Koschany <a...@gambaru.de> +Date: Sun, 3 Aug 2014 22:50:46 +0200 +Subject: missing separators + +Bug: https://bugs.debian.org/750082 + +--- + src/Makefile.am | 14 +++++++------- + src/Makefile.in | 14 +++++++------- + test/Makefile.am | 2 +- + test/Makefile.in | 2 +- + 4 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index fbd7e8f..96768d3 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -29,7 +29,7 @@ Script.cpp \ + StateBehavior.cpp \ + Table.cpp + +-dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) ++# libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) + + pininclude_HEADERS = \ + ArmBehavior.h \ +@@ -56,10 +56,10 @@ Table.h + # libemilia_pin.a libemilia_addon.a libemilia_base.a libltdlc.a + wpinball.exe: ${pinball_OBJECTS} ${pinball_DEPENDENCIES} + ${GCCLOCALDIR}g++ -g -W -Wall -O2 -o$@ $^ \ +- -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \ +- -lSDL_image -lSDLmain -lSDL \ +- -lglu32 -lopengl32 -ljpeg -lpng \ +- -lwinmm -luser32 -lgdi32 -ldxguid \ +- -lmingw32 -lSDLmain -lSDL -mwindows \ +- -L${GCCLOCALDIR}../lib ++ -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \ ++ -lSDL_image -lSDLmain -lSDL \ ++ -lglu32 -lopengl32 -ljpeg -lpng \ ++ -lwinmm -luser32 -lgdi32 -ldxguid \ ++ -lmingw32 -lSDLmain -lSDL -mwindows \ ++ -L${GCCLOCALDIR}../lib + # !-rzr : # have to solve it later # -lstdc++ +diff --git a/src/Makefile.in b/src/Makefile.in +index ea7651b..8e95cd6 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -505,7 +505,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES + + +-dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) ++ dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) + + # !+rzr : This trick workaround a bad generated rule (under Linux mingw32) + # src/ litool returns: -L/usr/local//lib /usr/lib/libjpeg.so +@@ -514,12 +514,12 @@ dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) + # libemilia_pin.a libemilia_addon.a libemilia_base.a libltdlc.a + wpinball.exe: ${pinball_OBJECTS} ${pinball_DEPENDENCIES} + ${GCCLOCALDIR}g++ -g -W -Wall -O2 -o$@ $^ \ +- -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \ +- -lSDL_image -lSDLmain -lSDL \ +- -lglu32 -lopengl32 -ljpeg -lpng \ +- -lwinmm -luser32 -lgdi32 -ldxguid \ +- -lmingw32 -lSDLmain -lSDL -mwindows \ +- -L${GCCLOCALDIR}../lib ++ -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \ ++ -lSDL_image -lSDLmain -lSDL \ ++ -lglu32 -lopengl32 -ljpeg -lpng \ ++ -lwinmm -luser32 -lgdi32 -ldxguid \ ++ -lmingw32 -lSDLmain -lSDL -mwindows \ ++ -L${GCCLOCALDIR}../lib + # !-rzr : # have to solve it later # -lstdc++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff --git a/test/Makefile.am b/test/Makefile.am +index d87cf34..ea3ffc9 100755 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -4,7 +4,7 @@ testlibdir = $(EM_LIBDIR) + testdatadir = $(pkgdatadir) + + noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest +-dnl noinst_PROGRAMS = unittest ++# noinst_PROGRAMS = unittest + + INCLUDES = -I../base -I../addon -I../src @INCLTDL@ + LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ +diff --git a/test/Makefile.in b/test/Makefile.in +index 6ba2646..47654dc 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -621,7 +621,7 @@ uninstall-am: uninstall-info-am uninstall-testlibLTLIBRARIES + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES + +-dnl noinst_PROGRAMS = unittest ++# noinst_PROGRAMS = unittest + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -Nru pinball-0.3.1/debian/patches/series pinball-0.3.1/debian/patches/series --- pinball-0.3.1/debian/patches/series 2011-09-22 22:26:30.000000000 +0200 +++ pinball-0.3.1/debian/patches/series 2014-08-03 23:07:26.000000000 +0200 @@ -4,3 +4,4 @@ 04_fix_const.patch 05_system_ltdl.patch 06_missing_cstddef.patch +missing-separators.patch
signature.asc
Description: OpenPGP digital signature
