r12958 - in packages/trunk/mmpong/debian: . patches source

[Stephen Webb]

Author: bregma-guest
Date: 2011-12-11 04:05:14 +0000 (Sun, 11 Dec 2011)
New Revision: 12958

Added:
   packages/trunk/mmpong/debian/patches/
   packages/trunk/mmpong/debian/patches/0002-cegui-mk2-0.7.5.patch
   packages/trunk/mmpong/debian/patches/series
   packages/trunk/mmpong/debian/source/
   packages/trunk/mmpong/debian/source/format
Modified:
   packages/trunk/mmpong/debian/changelog
   packages/trunk/mmpong/debian/control
Log:
* Team upload.
* Converted to quilt(3.0) format.
* Fixed FTBFS due to API change in cegui (Closes: #642144).
* Standards-Version: updated to 3.9.2 (no changes required).

Modified: packages/trunk/mmpong/debian/changelog
===================================================================
--- packages/trunk/mmpong/debian/changelog	2011-12-10 14:51:01 UTC (rev 12957)
+++ packages/trunk/mmpong/debian/changelog	2011-12-11 04:05:14 UTC (rev 12958)
@@ -1,3 +1,12 @@
+mmpong (0.9.1-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Converted to quilt(3.0) format.
+  * Fixed FTBFS due to API change in cegui (Closes: #642144).
+  * Standards-Version: updated to 3.9.2 (no changes required).
+
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sat, 10 Dec 2011 22:59:20 -0500
+
 mmpong (0.9.1-1) unstable; urgency=low
 
   * New upstream release: replace non-free with free font (Closes: #543782)

Modified: packages/trunk/mmpong/debian/control
===================================================================
--- packages/trunk/mmpong/debian/control	2011-12-10 14:51:01 UTC (rev 12957)
+++ packages/trunk/mmpong/debian/control	2011-12-11 04:05:14 UTC (rev 12958)
@@ -3,10 +3,10 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: André Gaul <gaul at web-yard.de>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, dpatch, cmake, libsdl1.2-dev,
+Build-Depends: debhelper (>= 7), cdbs, cmake, libsdl1.2-dev,
  libsdl-image1.2-dev, libsdl-mixer1.2-dev, libcaca-dev (>=0.99.beta16),
- libcegui-mk2-dev, pkg-config
-Standards-Version: 3.8.2
+ libcegui-mk2-dev (>= 0.7), pkg-config
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/mmpong
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/mmpong/?op=log
 Homepage: http://www.mmpong.net

Added: packages/trunk/mmpong/debian/patches/0002-cegui-mk2-0.7.5.patch
===================================================================
--- packages/trunk/mmpong/debian/patches/0002-cegui-mk2-0.7.5.patch	                        (rev 0)
+++ packages/trunk/mmpong/debian/patches/0002-cegui-mk2-0.7.5.patch	2011-12-11 04:05:14 UTC (rev 12958)
@@ -0,0 +1,38 @@
+Description: Updates to cegui mk2 0.7.5 API
+Author: James Page <james.page at ubuntu.com>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=642144
+
+--- a/client_gl/gui.cpp
++++ b/client_gl/gui.cpp
+@@ -148,9 +148,9 @@
+ 
+ 
+ GUI::GUI(std::string resbase, int w, int h, bool _visible, ClientState *_state) {
+-	renderer = new OpenGLRenderer(0, w, h);
++	renderer = &OpenGLRenderer::create(Size(w,h));
+ 	log =  new dummyLogger();
+-	sys = new System(renderer);
++	sys = &System::create(*renderer);
+ 	visible = _visible;
+ 	state = _state;
+ 	try {
+@@ -176,7 +176,7 @@
+ 		// ATTENTION (by andré): 
+ 		//    the next line segfaults with CEGUI 0.5.0-4.1 in Debian/Ubuntu
+ 		//    this is fixed in 0.6 (sorry, found no workaround atm)
+-		SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++		SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ 		sys->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ 		sys->setDefaultTooltip("TaharezLook/Tooltip");
+ 
+--- a/client_gl/gui.h
++++ b/client_gl/gui.h
+@@ -22,7 +22,7 @@
+ #define __GUI_H__
+ 
+ #include <CEGUI.h>
+-#include <RendererModules/OpenGLGUIRenderer/openglrenderer.h>
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+ #include <CEGUILogger.h>
+ #include "clientstate.h"
+ 

Added: packages/trunk/mmpong/debian/patches/series
===================================================================
--- packages/trunk/mmpong/debian/patches/series	                        (rev 0)
+++ packages/trunk/mmpong/debian/patches/series	2011-12-11 04:05:14 UTC (rev 12958)
@@ -0,0 +1 @@
+0002-cegui-mk2-0.7.5.patch

Added: packages/trunk/mmpong/debian/source/format
===================================================================
--- packages/trunk/mmpong/debian/source/format	                        (rev 0)
+++ packages/trunk/mmpong/debian/source/format	2011-12-11 04:05:14 UTC (rev 12958)
@@ -0,0 +1 @@
+3.0 (quilt)