tags: 778098 + patch Hi,
I am sending an NMU that fixes the FTBFS by adding -std=gnu89 to CFLAGS. I also fixed linitian warnings, added hardening, bumped standards and compat. Upstream may prefer to move to C99 using the instructions here https://gcc.gnu.org/gcc-5/porting_to.html. -- Dariusz Dwornikowski, Institute of Computing Science, Poznań University of Technology www.cs.put.poznan.pl/ddwornikowski/ room 1.6.2 BTiCW | tel. +48 61 665 23 71
diff -Nru quarry-0.2.0.dfsg.1/debian/changelog quarry-0.2.0.dfsg.1/debian/changelog --- quarry-0.2.0.dfsg.1/debian/changelog 2010-03-20 10:28:03.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/changelog 2015-07-19 17:08:03.000000000 +0200 @@ -1,3 +1,22 @@ +quarry (0.2.0.dfsg.1-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + - Update Standards-Version to 3.9.6, no changes needed + - VCS fields made canonical + - Update debhelper to 9 + * debian/patches: + - 03_fix_gcc5_build patch to fix FTBFS on GCC-5 + - 02_desktop_file refreshed to add Keywords and MIME exec + - 02_desktop_file and 01_fix_russian_translation converted to DEP-3 + * debian/rules: + - Added hardening flags + - Added -std=89 to fix FTBFS on GCC-5 (Closes: #778098) + * debian/compat: + - Updated to 9 + + -- Dariusz Dwornikowski <dariusz.dwornikow...@cs.put.poznan.pl> Sun, 19 Jul 2015 12:22:41 +0200 + quarry (0.2.0.dfsg.1-4) unstable; urgency=low * Maintainer set to Debian Games Team (Closes: #497242) diff -Nru quarry-0.2.0.dfsg.1/debian/compat quarry-0.2.0.dfsg.1/debian/compat --- quarry-0.2.0.dfsg.1/debian/compat 2010-03-20 10:12:43.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/compat 2015-07-19 16:43:48.000000000 +0200 @@ -1 +1 @@ -7 +9 diff -Nru quarry-0.2.0.dfsg.1/debian/control quarry-0.2.0.dfsg.1/debian/control --- quarry-0.2.0.dfsg.1/debian/control 2010-03-20 10:27:17.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/control 2015-07-19 16:45:26.000000000 +0200 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Vincent Legout <vinc...@legout.info> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, librsvg2-dev, libgtk2.0-dev, sharutils, imagemagick, gettext -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 9), autotools-dev, librsvg2-dev, libgtk2.0-dev, sharutils, imagemagick, gettext +Standards-Version: 3.9.6 Homepage: http://home.gna.org/quarry/ -Vcs-Git: git://git.debian.org/git/pkg-games/quarry.git -Vcs-Browser: http://git.debian.org/?p=pkg-games/quarry.git +Vcs-Git: git://anonscm.debian.org/pkg-games/quarry.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/quarry.git Package: quarry Architecture: any diff -Nru quarry-0.2.0.dfsg.1/debian/patches/02_desktop_file quarry-0.2.0.dfsg.1/debian/patches/02_desktop_file --- quarry-0.2.0.dfsg.1/debian/patches/02_desktop_file 2010-03-20 10:12:43.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/patches/02_desktop_file 2015-07-19 16:40:31.000000000 +0200 @@ -1,13 +1,22 @@ -# Description: Remove Encoding key in desktop file -# Author: Vincent Legout <vinc...@legout.info> - -Index: quarry/data/quarry.desktop.in -=================================================================== ---- quarry.orig/data/quarry.desktop.in 2010-03-17 10:49:56.584980426 +0800 -+++ quarry/data/quarry.desktop.in 2010-03-17 10:50:01.356990484 +0800 -@@ -1,5 +1,4 @@ +Description: Remove Encoding key in desktop file +Author: Vincent Legout <vinc...@legout.info> +Forwarded: no +Last-Update: 2015-07-19 +--- a/data/quarry.desktop.in ++++ b/data/quarry.desktop.in +@@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Name=Quarry GenericName=Board Game GUI Comment=A multi-purpose board game GUI for Go, Amazons and Reversi +-Exec=quarry ++Exec=quarry %f + Icon=quarry.png + Terminal=false + Type=Application +@@ -11,3 +10,4 @@ + Categories=Application;GTK;GNOME;Game;BoardGame; + StartupNotify=true + MimeType=application/x-go-sgf;text/sgf;text/x-sgf; ++Keywords=Game;LogicGame; diff -Nru quarry-0.2.0.dfsg.1/debian/patches/03_fix_gcc5_build.patch quarry-0.2.0.dfsg.1/debian/patches/03_fix_gcc5_build.patch --- quarry-0.2.0.dfsg.1/debian/patches/03_fix_gcc5_build.patch 1970-01-01 01:00:00.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/patches/03_fix_gcc5_build.patch 2015-07-19 16:31:47.000000000 +0200 @@ -0,0 +1,24 @@ +Description: Fix FTBS on gcc-5 +Author: Dariusz Dwornikowski <dariusz.dwornikow...@cs.put.poznan.pl> +Forwarded: no +Last-Update: 2015-07-19 +--- a/src/utils/utils.c ++++ b/src/utils/utils.c +@@ -92,7 +92,7 @@ + return pointer; + + fprintf (stderr, ("%s: fatal error: out of memory " +- "(failed to allocate %d bytes)\n"), ++ "(failed to allocate %lu bytes)\n"), + short_program_name, size); + exit (255); + } +@@ -138,7 +138,7 @@ + return pointer; + + fprintf (stderr, ("%s: fatal error: out of memory " +- "(failed to allocate %d bytes)\n"), ++ "(failed to allocate %lu bytes)\n"), + short_program_name, size); + exit (255); + } diff -Nru quarry-0.2.0.dfsg.1/debian/patches/series quarry-0.2.0.dfsg.1/debian/patches/series --- quarry-0.2.0.dfsg.1/debian/patches/series 2010-03-20 10:12:43.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/patches/series 2015-07-19 12:44:00.000000000 +0200 @@ -1,2 +1,3 @@ 01_fix_russian_translation 02_desktop_file +03_fix_gcc5_build.patch diff -Nru quarry-0.2.0.dfsg.1/debian/rules quarry-0.2.0.dfsg.1/debian/rules --- quarry-0.2.0.dfsg.1/debian/rules 2010-03-20 10:12:43.000000000 +0100 +++ quarry-0.2.0.dfsg.1/debian/rules 2015-07-19 16:52:54.000000000 +0200 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +CFLAGS= -g -pedantic -std=gnu89 + %: dh $@
signature.asc
Description: Digital signature
