[corsix-th] 01/05: rebase lua.patch onto 0.60~beta1, forwarded

[Phil Morrell]

This is an automated email from the git hooks/post-receive script.

emorrp1-guest pushed a commit to branch debian/experimental
in repository corsix-th.

commit c683c67cc73627d5859f023da3fbdde16350676c
Author: Phil Morrell <debian at emorrp1.name>
Date:   Sun Apr 17 00:53:19 2016 +0100

    rebase lua.patch onto 0.60~beta1, forwarded
    
    * previous not-needed approach has been abandoned
---
 debian/patches/lua.patch | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/patches/lua.patch b/debian/patches/lua.patch
index 4aa9ba0..323c1b0 100644
--- a/debian/patches/lua.patch
+++ b/debian/patches/lua.patch
@@ -1,6 +1,10 @@
 Subject: find lua 5.2
 Author: Christoph Korn <christoph.korn at getdeb.net>
-Forwarded: not needed, see https://github.com/CorsixTH/CorsixTH/pull/899
+Origin: https://github.com/ckorn/PlayDeb/commit/24d441933c042e44c16884eba1125406dcefcf74#diff-f68957b6e9561c95afdd68f41343ff97
+Reviewed-by: Phil Morrell <debian at emorrp1.name>
+Forwarded: https://github.com/CorsixTH/CorsixTH/pull/1039
+Applied-Upstream: v0.60-beta2, commit:831da62
+Last-Update: 2016-04-17
 
 ===================================================================
 --- corsix-th-0.50.orig/CMake/FindLua.cmake	2015-08-30 22:29:45.000000000 +0200
@@ -9,10 +13,10 @@ Forwarded: not needed, see https://github.com/CorsixTH/CorsixTH/pull/899
      SET (LUA_INCLUDE_DIRS include/luajit-2.0 include)
  ELSE (WITH_LUAJIT)
      SET (LUA_INTERPRETER_TYPE "Lua")
--    SET (LUA_LIBRARY_NAME lua53 lua52 lua5.1 lua51 lua lua-5.1 liblua)
--    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.1 include/lua51 include/lua-5.1)
-+    SET (LUA_LIBRARY_NAME lua53 lua5.2 lua52 lua5.1 lua51 lua lua-5.1 liblua)
-+    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.2 include/lua5.1 include/lua51 include/lua-5.1)
+-    SET (LUA_LIBRARY_NAME lua53 lua52 lua5.1 lua51 lua lua-5.1 liblua liblua.5.3.dylib)
+-    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.1 include/lua51 include/lua-5.1 include/lua5.3 include/lua-5.3)
++    SET (LUA_LIBRARY_NAME lua53 lua5.2 lua52 lua5.1 lua51 lua lua-5.1 liblua liblua.5.3.dylib)
++    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.1 include/lua51 include/lua-5.1 include/lua5.2 include/lua5.3 include/lua-5.3)
  ENDIF(WITH_LUAJIT)
  
  FIND_PATH (LUA_INCLUDE_DIR lua.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git