Author: miriam Date: 2012-06-03 08:50:35 +0000 (Sun, 03 Jun 2012) New Revision: 13662
Added: packages/trunk/love/debian/patches/glee_from_system.patch Modified: packages/trunk/love/debian/changelog packages/trunk/love/debian/patches/series packages/trunk/love/debian/rules Log: Tried to remove internal glee... it doesn't work (yet) Modified: packages/trunk/love/debian/changelog =================================================================== --- packages/trunk/love/debian/changelog 2012-06-03 00:38:13 UTC (rev 13661) +++ packages/trunk/love/debian/changelog 2012-06-03 08:50:35 UTC (rev 13662) @@ -4,7 +4,8 @@ * Upgraded Standards-Version from 3.9.2 to 3.9.3 * Added libvorbis-dev and glee-dev to Build-Depends. Closes: #672909 * Refreshed patches - * Removed sng + * Removed usage of sng for handling png files in debian/ + * Tried to removed internal glee, but it doesn't seem to like the system's one -- Miriam Ruiz <[email protected]> Sun, 03 Jun 2012 00:29:52 +0200 Added: packages/trunk/love/debian/patches/glee_from_system.patch =================================================================== --- packages/trunk/love/debian/patches/glee_from_system.patch (rev 0) +++ packages/trunk/love/debian/patches/glee_from_system.patch 2012-06-03 08:50:35 UTC (rev 13662) @@ -0,0 +1,132 @@ +--- love-0.8.0.orig/src/Makefile.am ++++ love-0.8.0/src/Makefile.am +@@ -198,8 +198,6 @@ + ./modules/graphics/opengl/Image.cpp \ + ./modules/graphics/opengl/Graphics.h \ + ./modules/graphics/opengl/Graphics.cpp \ +-./modules/graphics/opengl/GLee.h \ +-./modules/graphics/opengl/GLee.c \ + ./modules/graphics/opengl/Font.h \ + ./modules/graphics/opengl/Font.cpp \ + ./modules/graphics/opengl/Canvas.h \ +--- love-0.8.0.orig/src/modules/graphics/opengl/Canvas.h ++++ love-0.8.0/src/modules/graphics/opengl/Canvas.h +@@ -30,7 +30,7 @@ + #include <common/math.h> + #include <common/Matrix.h> + #include "OpenGL.h" +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/Font.h ++++ love-0.8.0/src/modules/graphics/opengl/Font.h +@@ -32,7 +32,7 @@ + #include <graphics/Image.h> + + #include "OpenGL.h" +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/Graphics.h ++++ love-0.8.0/src/modules/graphics/opengl/Graphics.h +@@ -26,7 +26,7 @@ + #include <cmath> + + // OpenGL +-#include "GLee.h" ++#include <GLee.h> + + // LOVE + #include <graphics/Graphics.h> +--- love-0.8.0.orig/src/modules/graphics/opengl/Image.h ++++ love-0.8.0/src/modules/graphics/opengl/Image.h +@@ -31,7 +31,7 @@ + #include "OpenGL.h" + + // OpenGL +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/OpenGL.h ++++ love-0.8.0/src/modules/graphics/opengl/OpenGL.h +@@ -21,7 +21,7 @@ + #ifndef LOVE_COMMON_OPENGL_H + #define LOVE_COMMON_OPENGL_H + +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/ParticleSystem.cpp ++++ love-0.8.0/src/modules/graphics/opengl/ParticleSystem.cpp +@@ -22,7 +22,7 @@ + + #include <common/math.h> + +-#include "GLee.h" ++#include <GLee.h> + #include <cmath> + #include <cstdlib> + +--- love-0.8.0.orig/src/modules/graphics/opengl/PixelEffect.cpp ++++ love-0.8.0/src/modules/graphics/opengl/PixelEffect.cpp +@@ -19,7 +19,7 @@ + **/ + + #include "PixelEffect.h" +-#include "GLee.h" ++#include <GLee.h> + + namespace + { +--- love-0.8.0.orig/src/modules/graphics/opengl/Quad.cpp ++++ love-0.8.0/src/modules/graphics/opengl/Quad.cpp +@@ -22,7 +22,7 @@ + #include <common/Matrix.h> + + // GLee +-#include "GLee.h" ++#include <GLee.h> + + // STD + #include <cstring> // For memcpy +--- love-0.8.0.orig/src/modules/graphics/opengl/SpriteBatch.h ++++ love-0.8.0/src/modules/graphics/opengl/SpriteBatch.h +@@ -35,7 +35,7 @@ + #include <graphics/Color.h> + + // OpenGL +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/VertexBuffer.h ++++ love-0.8.0/src/modules/graphics/opengl/VertexBuffer.h +@@ -26,7 +26,7 @@ + #include <graphics/Volatile.h> + + // OpenGL +-#include "GLee.h" ++#include <GLee.h> + + namespace love + { +--- love-0.8.0.orig/src/modules/graphics/opengl/wrap_Graphics.cpp ++++ love-0.8.0/src/modules/graphics/opengl/wrap_Graphics.cpp +@@ -19,7 +19,7 @@ + **/ + + #include "wrap_Graphics.h" +-#include "GLee.h" ++#include <GLee.h> + #include <graphics/DrawQable.h> + #include <image/ImageData.h> + #include <font/Rasterizer.h> Modified: packages/trunk/love/debian/patches/series =================================================================== --- packages/trunk/love/debian/patches/series 2012-06-03 00:38:13 UTC (rev 13661) +++ packages/trunk/love/debian/patches/series 2012-06-03 08:50:35 UTC (rev 13662) @@ -1,2 +1,3 @@ scripts_source.patch scripts_refresh.patch +#glee_from_system.patch Modified: packages/trunk/love/debian/rules =================================================================== --- packages/trunk/love/debian/rules 2012-06-03 00:38:13 UTC (rev 13661) +++ packages/trunk/love/debian/rules 2012-06-03 08:50:35 UTC (rev 13662) @@ -44,6 +44,7 @@ dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean + #rm -fv src/modules/graphics/opengl/GLee.* rm -fv config.sub config.guess config.log config.cache rm -fv *-stamp rm -fv bin/* _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
