tag 673389 patch pending thanks Hi,
I'm uploading an NMU for pingus (0.7.6-1.1) to DELAYED/2-day. Please let me know if you'd like me to cancel it or delay further. Cheers, Matej
pgpBiqIyJ39Az.pgp
Description: PGP signature
--- pingus-0.7.6~/debian/changelog +++ pingus-0.7.6/debian/changelog @@ -1,3 +1,12 @@ +pingus (0.7.6-1.1) unstable; urgency=low + + * Non-maintainer upload. + * 20_gcc_4.7: Fix build failure with GCC 4.7. Closes: #673389. + - src/pingus/pingus_main.cpp, src/pingus/screens/pingus_menu.cpp: + Add whitespace between string literals and macros. + + -- Matej Vela <v...@debian.org> Sat, 19 May 2012 11:21:44 +0100 + pingus (0.7.6-1) unstable; urgency=low * New upstream release. --- pingus-0.7.6~/debian/patches/20_gcc_4.7 +++ pingus-0.7.6/debian/patches/20_gcc_4.7 @@ -0,0 +1,29 @@ +Description: Fix build failure with GCC 4.7 + - src/pingus/pingus_main.cpp, src/pingus/screens/pingus_menu.cpp: + Add whitespace between string literals and macros. +Bug-Debian: http://bugs.debian.org/673389 +Author: Matej Vela <v...@debian.org> +Last-Update: 2012-05-19 + +--- a/src/pingus/pingus_main.cpp ++++ b/src/pingus/pingus_main.cpp +@@ -465,7 +465,7 @@ + void + PingusMain::print_greeting_message() + { +- std::string greeting = "Welcome to Pingus "VERSION; ++ std::string greeting = "Welcome to Pingus " VERSION; + greeting += "!"; + std::cout << greeting << std::endl; + for (unsigned int i = 0; i < greeting.length(); ++i) +--- a/src/pingus/screens/pingus_menu.cpp ++++ b/src/pingus/screens/pingus_menu.cpp +@@ -153,7 +153,7 @@ + gc.get_height()/2 - 280)); + + gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140), +- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grum...@gmail.com>\n" ++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grum...@gmail.com>\n" + "See the file AUTHORS for a complete list of contributors.\n" + "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n" + "welcome to redistribute it under certain conditions; see the file COPYING for details.\n"); --- pingus-0.7.6~/debian/patches/series +++ pingus-0.7.6/debian/patches/series @@ -2,0 +2,1 @@ +20_gcc_4.7
