Control: tags -1 + patch
diff -Nru gargoyle-free-2011.1a/debian/changelog gargoyle-free-2011.1a/debian/changelog --- gargoyle-free-2011.1a/debian/changelog 2013-10-13 17:14:08.000000000 +0200 +++ gargoyle-free-2011.1a/debian/changelog 2015-07-08 14:55:37.000000000 +0200 @@ -1,3 +1,11 @@ +gargoyle-free (2011.1a-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix build failure with GCC 5. Closes: #777860. + * Build-depend on libpng-dev instead of libpng12-dev. Closes: #662341. + + -- Matthias Klose <d...@debian.org> Wed, 08 Jul 2015 14:42:50 +0200 + gargoyle-free (2011.1a-2) unstable; urgency=low * Fix package description: Alan 2 is now included. diff -Nru gargoyle-free-2011.1a/debian/control gargoyle-free-2011.1a/debian/control --- gargoyle-free-2011.1a/debian/control 2013-10-13 17:13:39.000000000 +0200 +++ gargoyle-free-2011.1a/debian/control 2015-07-08 14:55:43.000000000 +0200 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Sylvain Beucler <b...@debian.org> -Build-Depends: quilt, debhelper (>= 7.0.50~), jam, libgtk2.0-dev, libpng12-dev, libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libfreetype6-dev, libfontconfig1-dev, pkg-config +Build-Depends: quilt, debhelper (>= 7.0.50~), jam, libgtk2.0-dev, libpng-dev, libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libfreetype6-dev, libfontconfig1-dev, pkg-config Standards-Version: 3.9.4 Homepage: http://ccxvii.net/gargoyle/ Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git diff -Nru gargoyle-free-2011.1a/debian/patches/gcc5.patch gargoyle-free-2011.1a/debian/patches/gcc5.patch --- gargoyle-free-2011.1a/debian/patches/gcc5.patch 1970-01-01 01:00:00.000000000 +0100 +++ gargoyle-free-2011.1a/debian/patches/gcc5.patch 2015-07-08 15:01:15.000000000 +0200 @@ -0,0 +1,25 @@ +Index: b/Jamrules +=================================================================== +--- a/Jamrules ++++ b/Jamrules +@@ -16,8 +16,8 @@ GARGLKINI ?= /etc/garglk.ini ; + # jam -sGARGLKPRE=gargoyle- + GARGLKPRE ?= "" ; + +-CC ?= gcc ; +-CXX ?= g++ ; ++CC ?= "gcc -fgnu89-inline" ; ++CXX ?= "g++ -fgnu89-inline" ; + + if $(CROSS) + { +@@ -159,6 +159,9 @@ switch $(OS) + Exit "Unknown target. Please edit 'Jamrules'." ; + } + ++Echo "CC is $(CC)" ; ++Echo "CXX is $(CXX)" ; ++ + switch $(BUILD) + { + case DEBUG : diff -Nru gargoyle-free-2011.1a/debian/rules gargoyle-free-2011.1a/debian/rules --- gargoyle-free-2011.1a/debian/rules 2013-07-28 10:40:07.000000000 +0200 +++ gargoyle-free-2011.1a/debian/rules 2015-07-08 15:02:48.000000000 +0200 @@ -24,6 +24,9 @@ TARGET := $(CURDIR)/debian/gargoyle-free +export CC = gcc -fgnu89-inline +export CXX = g++ -fgnu89-inline + %: dh $@ --parallel
