r13819 - in packages/trunk/love/debian: . mimelnk patches

[Bas Wijnen]

Author: wijnen
Date: 2012-10-16 08:01:23 +0000 (Tue, 16 Oct 2012)
New Revision: 13819

Modified:
   packages/trunk/love/debian/changelog
   packages/trunk/love/debian/mimelnk/x-love-game.desktop
   packages/trunk/love/debian/patches/glee_from_system.patch
   packages/trunk/love/debian/patches/series
Log:
actually released version

Modified: packages/trunk/love/debian/changelog
===================================================================
--- packages/trunk/love/debian/changelog	2012-10-14 15:51:15 UTC (rev 13818)
+++ packages/trunk/love/debian/changelog	2012-10-16 08:01:23 UTC (rev 13819)
@@ -1,15 +1,10 @@
-love (0.8.0-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Bas Wijnen <wijnen at debian.org>  Sun, 14 Oct 2012 17:50:52 +0200
-
 love (0.8.0-2) unstable; urgency=low
 
   * Team upload.
   * Convert copyright file to machine readable format.
   * Add copyright information for utf8-cpp. Closes: #690394
-  * Add hardening flags to build rules.
+  * Add hardening flags to build rules. Closes: #690494
+  * Replace included GLee with system version. Closes: #690492
 
  -- Bas Wijnen <wijnen at debian.org>  Sun, 14 Oct 2012 15:01:02 +0200
 

Modified: packages/trunk/love/debian/mimelnk/x-love-game.desktop
===================================================================
--- packages/trunk/love/debian/mimelnk/x-love-game.desktop	2012-10-14 15:51:15 UTC (rev 13818)
+++ packages/trunk/love/debian/mimelnk/x-love-game.desktop	2012-10-16 08:01:23 UTC (rev 13819)
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=MimeType
 Exec=love %f
 Name=Löve Game

Modified: packages/trunk/love/debian/patches/glee_from_system.patch
===================================================================
--- packages/trunk/love/debian/patches/glee_from_system.patch	2012-10-14 15:51:15 UTC (rev 13818)
+++ packages/trunk/love/debian/patches/glee_from_system.patch	2012-10-16 08:01:23 UTC (rev 13819)
@@ -1,3 +1,12 @@
+Description: Replace included GLee with system version
+ Disable use of included GLee, using the system version instead.
+Author: Bas Wijnen <wijnen at debian.org>
+Bug-Debian: http://bugs.debian.org/690492
+Forwarded: no
+Last-Update: 2012-10-14
+
+Index: love-0.8.0/configure.in
+===================================================================
 --- love-0.8.0.orig/src/Makefile.am
 +++ love-0.8.0/src/Makefile.am
 @@ -198,8 +198,6 @@
@@ -130,3 +139,13 @@
  #include <graphics/DrawQable.h>
  #include <image/ImageData.h>
  #include <font/Rasterizer.h>
+--- love-0.8.0.orig/configure.in	2012-10-14 22:16:31.000000000 +0200
++++ love-0.8.0/configure.in	2012-10-14 22:31:15.232423281 +0200
+@@ -13,6 +13,7 @@
+ AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
+ #AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
+ AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
++AC_SEARCH_LIBS([GLeeInit], [glee], [], AC_MSG_ERROR([Can't LÖVE without GLee]))
+ lua=lua
+ AC_ARG_WITH([luajit],
+ 	    [AS_HELP_STRING([--with-luajit], [Use LuaJIT instead of lua and llvm-lua])],

Modified: packages/trunk/love/debian/patches/series
===================================================================
--- packages/trunk/love/debian/patches/series	2012-10-14 15:51:15 UTC (rev 13818)
+++ packages/trunk/love/debian/patches/series	2012-10-16 08:01:23 UTC (rev 13819)
@@ -1,3 +1,3 @@
 scripts_source.patch
 scripts_refresh.patch
-#glee_from_system.patch
+glee_from_system.patch