r13635 - in packages/trunk/fillets-ng/debian: . patches

[Damyan Ivanov]

Author: dmn
Date: 2012-05-28 19:26:35 +0000 (Mon, 28 May 2012)
New Revision: 13635

Added:
   packages/trunk/fillets-ng/debian/patches/lua51.patch
Modified:
   packages/trunk/fillets-ng/debian/changelog
   packages/trunk/fillets-ng/debian/patches/series
Log:
add patch from Guillem Jover migrating to Lua 5.1 (Closes: #674621)

Modified: packages/trunk/fillets-ng/debian/changelog
===================================================================
--- packages/trunk/fillets-ng/debian/changelog	2012-05-27 22:19:56 UTC (rev 13634)
+++ packages/trunk/fillets-ng/debian/changelog	2012-05-28 19:26:35 UTC (rev 13635)
@@ -1,3 +1,9 @@
+fillets-ng (1.0.1-2) UNRELEASED; urgency=low
+
+  * add patch from Guillem Jover migrating to Lua 5.1 (Closes: #674621)
+
+ -- Damyan Ivanov <dmn at debian.org>  Mon, 28 May 2012 22:25:21 +0300
+
 fillets-ng (1.0.1-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/trunk/fillets-ng/debian/patches/lua51.patch
===================================================================
--- packages/trunk/fillets-ng/debian/patches/lua51.patch	                        (rev 0)
+++ packages/trunk/fillets-ng/debian/patches/lua51.patch	2012-05-28 19:26:35 UTC (rev 13635)
@@ -0,0 +1,44 @@
+From 7be89493082b76813282e60360c11408aa2e181d Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem at hadrons.org>
+Date: Sat, 26 May 2012 03:04:54 +0200
+Subject: [PATCH] Switch to Lua 5.1
+
+diff --git a/configure.in b/configure.in
+index cc94356..9b196bf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -36,31 +36,9 @@ if test "x$LUAPFX" != x ; then
+     LUA_CFLAGS="-I$LUAPFX"
+     LUA_LIBS="-L$LUAPFX -llua -llualib"
+ else
+-dnl Debian, and possibly other systems, include this script...
+-    AC_CHECK_PROGS(LUACONFIG, [lua-config lua-config50 lua-config5.0], "")
+-    if test "x$LUACONFIG" != x; then
+-        LUA_CFLAGS="`[$LUACONFIG --include]`"
+-        LUA_LIBS="`[$LUACONFIG --static]`"
+-    else dnl ...otherwise, attempt to guess
+-        PKG_CHECK_MODULES(LUA, lua, [], [
+-            LUA_CFLAGS=""
+-            LUA_LIBS=""
+-            AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
+-            [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
+-            [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
+-                [AC_MSG_ERROR([*** Lua5 is required.
+-                 Try --with-lua=PREFIX
+-                 You can download lua from http://www.lua.org])],
+-                 $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
+-
+-            AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
+-            [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50",
+-            [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0",
+-                [AC_MSG_ERROR([*** Lualib5 is required.
+-                 You can download lua from http://www.lua.org])],
+-                 $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
+-        ])
+-   fi
++    PKG_CHECK_MODULES(LUA, [lua5.1], [], [
++        AC_MSG_ERROR([*** Lualib5.1 is required.
++                      You can download lua from http://www.lua.org])])
+ fi
+ AC_SUBST(LUA_CFLAGS)
+ AC_SUBST(LUA_LIBS)

Modified: packages/trunk/fillets-ng/debian/patches/series
===================================================================
--- packages/trunk/fillets-ng/debian/patches/series	2012-05-27 22:19:56 UTC (rev 13634)
+++ packages/trunk/fillets-ng/debian/patches/series	2012-05-28 19:26:35 UTC (rev 13635)
@@ -1 +1,2 @@
 gcc-4.3-fix
+lua51.patch