[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.2.7-1-3-ga854830

[Jan Dittberner]

The following commit has been merged in the master branch:
commit ffa6fae88224ab475f9a1cd141cddd7108cde630
Author: Jan Dittberner <jandd at debian.org>
Date:   Sun Aug 7 14:48:09 2011 +0200

    repair debian/patches/use_system_lua5.1.diff for multiarch

diff --git a/debian/changelog b/debian/changelog
index 5ca5efc..ff73bd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freeciv (2.2.7-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * repair debian/patches/use_system_lua5.1.diff for multiarch support
+
+ -- Jan Dittberner <jandd at debian.org>  Sun, 07 Aug 2011 14:20:16 +0200
+
 freeciv (2.2.7-1) unstable; urgency=low
 
   [ Karl Goetz ]
diff --git a/debian/patches/use_system_lua5.1.diff b/debian/patches/use_system_lua5.1.diff
index 4ad173f..93ae8b3 100644
--- a/debian/patches/use_system_lua5.1.diff
+++ b/debian/patches/use_system_lua5.1.diff
@@ -2,32 +2,36 @@ Description: Patch to move from internal lua to system lua
 Author: Karl Goetz <karl at kgoetz.id.au>
 # Found upstream, not forwarded per se.
 Forwarded: https://gna.org/patch/?2747 https://gna.org/bugs/?18263
-Last-Update: <2011-07-17>
+Last-Update: <2011-08-07>
 
---- freeciv-2.2.1.orig/configure.ac
-+++ freeciv-2.2.1/configure.ac
-@@ -851,8 +851,8 @@ AC_CHECK_FUNCS([isatty popen _longjmp])
+---
+ configure    |    4 ++--
+ configure.ac |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -853,8 +853,8 @@
  dnl In the future we probably get rid of our own lua tree and use
  dnl lua from system.
  dnl LUA_AS_DEPENDENCY should be empty when using lua outside own our tree.
 -LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src"
 -LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a"
-+LUA_CFLAGS := $(shell pkg-config lua5.1 --cflags)
-+LUA_LIBS="/usr/lib/liblua5.1.a"
++LUA_CFLAGS=$(pkg-config lua5.1 --cflags)
++LUA_LIBS="$(pkg-config lua5.1 --libs --static)"
  LUA_AS_DEPENDENCY="$LUA_LIBS"
  AC_SUBST([LUA_CFLAGS])
  AC_SUBST([LUA_LIBS])
---- freeciv-2.2.1.orig/configure
-+++ freeciv-2.2.1/configure
-@@ -29522,8 +29522,8 @@ fi
+--- a/configure
++++ b/configure
+@@ -29583,8 +29583,8 @@
  done
  
  
 -LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src"
 -LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a"
-+LUA_CFLAGS="\$(shell pkg-config lua5.1 --cflags)"
-+LUA_LIBS="/usr/lib/liblua5.1.a"
++LUA_CFLAGS="$(pkg-config lua5.1 --cflags)"
++LUA_LIBS="$(pkg-config lua5.1 --libs --static)"
  LUA_AS_DEPENDENCY="$LUA_LIBS"
  
  
-

-- 
Civilization turn-based strategy game