corsix-th: 0.50-1~getdeb3

* Add runtime dependency on lua-lpeg * Build against Lua 5.2 (LP: #1494587)
ckorn · Sep 17, 2015 · 24d4419 · 24d4419
1 parent 357ae57
commit 24d4419
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/corsix-th/changelog b/corsix-th/changelog
@@ -1,3 +1,10 @@
+corsix-th (0.50-1~getdeb3) trusty; urgency=medium
+
+  * Add runtime dependency on lua-lpeg
+  * Build against Lua 5.2 (LP: #1494587)
+
+ -- Christoph Korn <christoph.korn@getdeb.net>  Thu, 17 Sep 2015 20:34:35 +0200
+
 corsix-th (0.50-1~getdeb1) trusty; urgency=medium
 
   * New upstream version

diff --git a/corsix-th/control b/corsix-th/control
@@ -6,15 +6,14 @@ Build-Depends: debhelper (>= 9),
                cmake,
                libsdl2-dev,
                libsdl2-mixer-dev,
-               liblua5.1-0-dev,
+               liblua5.2-dev,
                libfreetype6-dev,
                wx2.8-headers,
                libavcodec-dev,
                libavformat-dev,
                libavdevice-dev,
                libswscale-dev,
-               libpostproc-dev,
-               libluajit-5.1-dev
+               libpostproc-dev
 Standards-Version: 3.9.5
 Homepage: https://code.google.com/p/corsix-th/
 
@@ -23,7 +22,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          corsix-th-data (= ${source:Version}),
-         lua-filesystem
+         lua-filesystem,
+         lua-lpeg
 Recommends: theme-hospital-full-data | theme-hospital-demo-data | game-data-packager
 Description: Open source clone of Theme Hospital
  As computers evolve, it is risked losing some

diff --git a/corsix-th/patches/lua.patch b/corsix-th/patches/lua.patch
@@ -0,0 +1,16 @@
+# find lua 5.2
+Index: corsix-th-0.50/CMake/FindLua.cmake
+===================================================================
+--- corsix-th-0.50.orig/CMake/FindLua.cmake	2015-08-30 22:29:45.000000000 +0200
++++ corsix-th-0.50/CMake/FindLua.cmake	2015-09-17 21:02:42.749389729 +0200
+@@ -26,8 +26,8 @@
+     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)
+ ENDIF(WITH_LUAJIT)
+
+ FIND_PATH (LUA_INCLUDE_DIR lua.h
diff --git a/corsix-th/patches/series b/corsix-th/patches/series
@@ -0,0 +1 @@
+lua.patch