r14364 - in packages/trunk/mmpong/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-06-30 02:35:56 +0000 (Sun, 30 Jun 2013)
New Revision: 14364

Added:
   packages/trunk/mmpong/debian/patches/0003-FTBFS-gcc-4.7.patch
Modified:
   packages/trunk/mmpong/debian/changelog
   packages/trunk/mmpong/debian/patches/series
Log:
Integrate nmu changes.

Modified: packages/trunk/mmpong/debian/changelog
===================================================================
--- packages/trunk/mmpong/debian/changelog	2013-06-29 21:22:51 UTC (rev 14363)
+++ packages/trunk/mmpong/debian/changelog	2013-06-30 02:35:56 UTC (rev 14364)
@@ -1,3 +1,12 @@
+mmpong (0.9.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: client.cpp:276:71: error: 'usleep' was not declared in
+    this scope": add patch from Cyril Roelandt (missing includes).
+    (Closes: #672025)
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 21 May 2012 21:17:38 +0200
+
 mmpong (0.9.1-2) unstable; urgency=low
 
   * Team upload.

Added: packages/trunk/mmpong/debian/patches/0003-FTBFS-gcc-4.7.patch
===================================================================
--- packages/trunk/mmpong/debian/patches/0003-FTBFS-gcc-4.7.patch	                        (rev 0)
+++ packages/trunk/mmpong/debian/patches/0003-FTBFS-gcc-4.7.patch	2013-06-30 02:35:56 UTC (rev 14364)
@@ -0,0 +1,28 @@
+Description: add missing includes to avoid FTBFS with gcc 4.7
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/672025
+Forwarded: no
+Author: Cyril Roelandt <tipecaml at gmail.com>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-05-21
+
+--- mmpong-0.9.1.orig/client_gl/client.cpp	2009-01-12 23:19:44.000000000 +0100
++++ mmpong-0.9.1/client_gl/client.cpp	2012-05-14 03:53:38.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <SDL_mixer.h>
+ #include <iostream>
++#include <unistd.h>
+ 
+ #include "clientstate.h"
+ #include "config.h"
+--- mmpong-0.9.1.orig/client_gl/netgame.cpp	2009-01-12 22:28:28.000000000 +0100
++++ mmpong-0.9.1/client_gl/netgame.cpp	2012-05-14 03:54:40.000000000 +0200
+@@ -30,6 +30,7 @@
+ # include <netinet/tcp.h>
+ # include <netinet/ip.h>
+ # include <fcntl.h>
++# include <unistd.h>
+ #endif
+ 
+ #include <stdexcept>

Modified: packages/trunk/mmpong/debian/patches/series
===================================================================
--- packages/trunk/mmpong/debian/patches/series	2013-06-29 21:22:51 UTC (rev 14363)
+++ packages/trunk/mmpong/debian/patches/series	2013-06-30 02:35:56 UTC (rev 14364)
@@ -1,2 +1,3 @@
 0001-manpages.patch
 0002-cegui-mk2-0.7.5.patch
+0003-FTBFS-gcc-4.7.patch