tags 565087 + patch tags 565087 + pending thanks Dear maintainer,
I've prepared an NMU for njam (versioned as 1.25-5.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Jerry Lee Lewis: High School Confidencial
diff -u njam-1.25/debian/changelog njam-1.25/debian/changelog
--- njam-1.25/debian/changelog
+++ njam-1.25/debian/changelog
@@ -1,3 +1,13 @@
+njam (1.25-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "ftbfs with gcc-4.5": add patch gcc_46.dpatch from Ubuntu /
+ Andreas Moog:
+ - Fix compile with newer gcc versions.
+ (LP: #756133) (Closes: #565087)
+
+ -- gregor herrmann <gre...@debian.org> Tue, 18 Oct 2011 19:02:41 +0200
+
njam (1.25-5) unstable; urgency=medium
* Fixed the bug when njam overwrites the high scores file on upgrade
diff -u njam-1.25/debian/patches/00list njam-1.25/debian/patches/00list
--- njam-1.25/debian/patches/00list
+++ njam-1.25/debian/patches/00list
@@ -1,0 +2 @@
+gcc_46.dpatch
only in patch2:
unchanged:
--- njam-1.25.orig/debian/patches/gcc_46.dpatch
+++ njam-1.25/debian/patches/gcc_46.dpatch
@@ -0,0 +1,28 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+Description: gcc4.5 and later are more restrictive with c++ function calls,
+ this trivial patch fixes build failures with -fpermissive
+Author: Andreas Moog <am...@ubuntu.com>
+Last-Update: 2011-07-15
+
+=== modified file 'src/njamedit.cpp'
+--- a/src/njamedit.cpp 2006-07-27 23:15:50 +0000
++++ b/src/njamedit.cpp 2011-07-15 20:01:54 +0000
+@@ -114,7 +114,7 @@
+ key = SDLK_a;
+ else if (CheckForSave())
+ {
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(filename);
+ level_type_was = level_type;
+ changed = false;
+@@ -131,7 +131,7 @@
+ char types[2][5] = { "COOP", "DUEL" };
+ sprintf(buf, "levels/%s.%s\0", filename, types[level_type]);
+ sprintf(filename, "%s\0", buf);
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(filename);
+ level_type_was = level_type;
+ changed = false;
+
signature.asc
Description: Digital signature
