r13600 - in packages/trunk/pingus/debian: . patches

[Bertrand Marc]

Author: bbk-guest
Date: 2012-05-21 20:27:43 +0000 (Mon, 21 May 2012)
New Revision: 13600

Added:
   packages/trunk/pingus/debian/patches/20_gcc_4.7
Modified:
   packages/trunk/pingus/debian/changelog
   packages/trunk/pingus/debian/patches/series
Log:
Acknowledge NMU from Matej Vela

Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog	2012-05-21 20:19:47 UTC (rev 13599)
+++ packages/trunk/pingus/debian/changelog	2012-05-21 20:27:43 UTC (rev 13600)
@@ -1,10 +1,20 @@
 pingus (0.7.6-2) UNRELEASED; urgency=low
 
+  * Acknowledge NMU from Matej Vela, thanks for the quick fix.
   * Add a german comment in pingus.dektop, thanks to Ronny Standtke
     (Closes: #667673).
 
  -- Bertrand Marc <beberking at gmail.com>  Mon, 09 Apr 2012 13:38:33 +0200
 
+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 <vela at debian.org>  Sat, 19 May 2012 11:21:44 +0100
+
 pingus (0.7.6-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/trunk/pingus/debian/patches/20_gcc_4.7
===================================================================
--- packages/trunk/pingus/debian/patches/20_gcc_4.7	                        (rev 0)
+++ packages/trunk/pingus/debian/patches/20_gcc_4.7	2012-05-21 20:27:43 UTC (rev 13600)
@@ -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 <vela at 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 <grumbel at gmail.com>\n"
++                "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel at 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");

Modified: packages/trunk/pingus/debian/patches/series
===================================================================
--- packages/trunk/pingus/debian/patches/series	2012-05-21 20:19:47 UTC (rev 13599)
+++ packages/trunk/pingus/debian/patches/series	2012-05-21 20:27:43 UTC (rev 13600)
@@ -1 +1,2 @@
 #10_fix_data_directory
+20_gcc_4.7