diff -Nru criticalmass-1.0.0/debian/changelog criticalmass-1.0.0/debian/changelog --- criticalmass-1.0.0/debian/changelog 2015-09-05 11:22:05.000000000 +0000 +++ criticalmass-1.0.0/debian/changelog 2016-01-12 09:12:04.000000000 +0000 @@ -1,3 +1,14 @@ +criticalmass (1:1.0.0-4) unstable; urgency=medium + + * QA upload. + * Fix FTBFS with libpng16, depend on libpng-dev (closes: #809863). + * Build autoconfage from source (needed to detect libpng16). + * Use system libcurl (closes: #599061). + * Add build-arch and build-indep targets. + * Properly use zlib encludes. + + -- Adam Borowski Tue, 12 Jan 2016 10:12:01 +0100 + criticalmass (1:1.0.0-3) unstable; urgency=medium * QA upload. diff -Nru criticalmass-1.0.0/debian/control criticalmass-1.0.0/debian/control --- criticalmass-1.0.0/debian/control 2015-09-05 10:00:22.000000000 +0000 +++ criticalmass-1.0.0/debian/control 2016-01-12 08:08:19.000000000 +0000 @@ -2,8 +2,8 @@ Section: games Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 7.1), libgl1-mesa-dev | libgl-dev, libsdl-image1.2-dev (>= 1.2.2), libsdl-mixer1.2-dev, libsdl1.2-dev, zlib1g-dev, g++ (>= 3:3.2.2), autotools-dev, libpng12-dev, dh-autoreconf -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.1), libgl1-mesa-dev | libgl-dev, libsdl-image1.2-dev (>= 1.2.2), libsdl-mixer1.2-dev, libsdl1.2-dev, zlib1g-dev, g++ (>= 3:3.2.2), autotools-dev, libpng-dev, dh-autoreconf, libcurl4-gnutls-dev +Standards-Version: 3.9.6 Homepage: http://criticalmass.sourceforge.net/critter.php Package: criticalmass diff -Nru criticalmass-1.0.0/debian/generated-files.txt criticalmass-1.0.0/debian/generated-files.txt --- criticalmass-1.0.0/debian/generated-files.txt 2015-09-05 10:00:09.000000000 +0000 +++ criticalmass-1.0.0/debian/generated-files.txt 2016-01-12 07:53:13.000000000 +0000 @@ -44,3 +44,21 @@ utils/Makefile utilsgl/Makefile utilssdl/Makefile +aclocal.m4 +compile +config.guess +config.sub +configure +defines.h.in +install.sh +missing +install-sh +Makefile.in +data/Makefile.in +data/music/Makefile.in +game/Makefile.in +tinyxml/Makefile.in +tools/Makefile.in +utils/Makefile.in +utilsgl/Makefile.in +utilssdl/Makefile.in diff -Nru criticalmass-1.0.0/debian/patches/autogen criticalmass-1.0.0/debian/patches/autogen --- criticalmass-1.0.0/debian/patches/autogen 1970-01-01 00:00:00.000000000 +0000 +++ criticalmass-1.0.0/debian/patches/autogen 2016-01-12 07:58:25.000000000 +0000 @@ -0,0 +1,16 @@ +--- criticalmass-1.0.0.orig/autogen.sh ++++ criticalmass-1.0.0/autogen.sh +@@ -1,10 +1,11 @@ + #!/bin/sh +-# ++ ++touch defines.h.in + aclocal + automake --foreign --copy --ignore-deps --add-missing + autoconf + rm -f stamp-h1 +-touch defines.h.in ++autoheader + + # Run configure for this platform + #./configure $* diff -Nru criticalmass-1.0.0/debian/patches/libpng16 criticalmass-1.0.0/debian/patches/libpng16 --- criticalmass-1.0.0/debian/patches/libpng16 1970-01-01 00:00:00.000000000 +0000 +++ criticalmass-1.0.0/debian/patches/libpng16 2016-01-12 08:54:32.000000000 +0000 @@ -0,0 +1,41 @@ +--- criticalmass-1.0.0.orig/configure.in ++++ criticalmass-1.0.0/configure.in +@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then + else + LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" + CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" +- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) ++ AC_CHECK_LIB(png16, main,, AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))) + AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) + if test "x$TARGET" = xUNIX; then + if test "x$enable_dyngl" = xoff; then +--- criticalmass-1.0.0.orig/game/main.cpp ++++ criticalmass-1.0.0/game/main.cpp +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + void migrateConfig( void) + { +--- criticalmass-1.0.0.orig/utilssdl/PNG.cpp ++++ criticalmass-1.0.0/utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ void PNG::writeData( png_structp png, pn + { + png_size_t check; + +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)png_get_io_ptr(png)); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ bool PNG::init( FILE *fp, int width, int + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff -Nru criticalmass-1.0.0/debian/patches/series criticalmass-1.0.0/debian/patches/series --- criticalmass-1.0.0/debian/patches/series 2015-09-05 11:11:26.000000000 +0000 +++ criticalmass-1.0.0/debian/patches/series 2016-01-12 08:54:25.000000000 +0000 @@ -1,2 +1,5 @@ full-debian-patch-before-switch-to-3-dot-0-format do-not-embed-the-build-date +autogen +use_system_libcurl +libpng16 diff -Nru criticalmass-1.0.0/debian/patches/use_system_libcurl criticalmass-1.0.0/debian/patches/use_system_libcurl --- criticalmass-1.0.0/debian/patches/use_system_libcurl 1970-01-01 00:00:00.000000000 +0000 +++ criticalmass-1.0.0/debian/patches/use_system_libcurl 2016-01-12 07:58:58.000000000 +0000 @@ -0,0 +1,51 @@ +--- criticalmass-1.0.0.orig/Makefile.am ++++ criticalmass-1.0.0/Makefile.am +@@ -4,7 +4,7 @@ + AUTOMAKE_OPTIONS = 1.4 + + ## Any directories that you want built and installed should go here. +-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game ++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game + + ## Any directories you want a part of the distribution should be listed + ## here, as well as have a Makefile generated at the end of configure.in +--- criticalmass-1.0.0.orig/configure.in ++++ criticalmass-1.0.0/configure.in +@@ -115,7 +115,9 @@ fi + AC_CHECK_LIB(m, sin,, + AC_MSG_ERROR(libm is needed)) + +-AC_CONFIG_SUBDIRS(curl) ++LIBCURL_CHECK_CONFIG ++LIBS="$LIBS $LIBCURL" ++CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS" + + AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) + +--- criticalmass-1.0.0.orig/game/Makefile.am ++++ criticalmass-1.0.0/game/Makefile.am +@@ -41,21 +41,20 @@ critter_SOURCES = \ + main.cpp + + LDADD = \ +- ../curl/lib/libcurl.a \ + ../utils/libutils.a \ + ../utilssdl/libutilssdl.a \ + ../utilsgl/libutilsgl.a \ + ../tinyxml/libtinyxml.a + + if WIN32 +-INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\" ++INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\" + LDADD += critter.res + else + + if APPLE +-INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\" ++INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\" + else +-INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\" ++INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\" + endif + + endif diff -Nru criticalmass-1.0.0/debian/rules criticalmass-1.0.0/debian/rules --- criticalmass-1.0.0/debian/rules 2015-09-05 10:01:28.000000000 +0000 +++ criticalmass-1.0.0/debian/rules 2016-01-12 09:11:55.000000000 +0000 @@ -9,10 +9,13 @@ configure-stamp: dh_testdir dh_autotools-dev_updateconfig + ./autogen.sh ./configure --prefix=/usr --datadir=\$${prefix}/share/games --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info touch configure-stamp +build-arch: build +build-indep: build build: configure-stamp build-stamp build-stamp: dh_testdir