From c4967db0cc23d5ac3a6005c7edd5e419fcc48031 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 15 Nov 2014 18:24:10 +1300
Subject: [PATCH] Remove native code from deb packages.

---
 Makefile                              | 2 +-
 packaging/linux/buildpackage.sh       | 9 +++------
 packaging/linux/deb/DEBIAN/control    | 2 +-
 packaging/linux/deb/Eluant.dll.config | 3 +++
 packaging/linux/deb/buildpackage.sh   | 1 +
 packaging/package-all.sh              | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 packaging/linux/deb/Eluant.dll.config

diff --git a/Makefile b/Makefile
index de56436cef..168de14f50 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ core: game renderers mods utility ralint
 
 tools: editor tsbuild gamemonitor
 
-package: dependencies core editor gamemonitor docs version
+package: cli-dependencies core editor gamemonitor docs version
 
 mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index e4960ad290..112a0380cf 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 # OpenRA packaging master script for linux packages
 
-if [ $# -ne "4" ]; then
-	echo "Usage: `basename $0` tag files-dir platform-files-dir outputdir"
+if [ $# -ne "3" ]; then
+	echo "Usage: `basename $0` tag files-dir outputdir"
     exit 1
 fi
 
 TAG=$1
 VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 BUILTDIR=$2
-DEPSDIR=$3
-PACKAGEDIR=$4
+PACKAGEDIR=$3
 ROOTDIR=root
 
 # Clean up
@@ -21,8 +20,6 @@ cd ../..
 # Copy files for OpenRA.Game.exe and OpenRA.Editor.exe as well as all dependencies.
 make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
-cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/
-
 # Install startup scripts, desktop files and icons
 make install-linux-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control
index b68226179d..2590547d54 100644
--- a/packaging/linux/deb/DEBIAN/control
+++ b/packaging/linux/deb/DEBIAN/control
@@ -3,7 +3,7 @@ Version: {VERSION}
 Architecture: all
 Maintainer: Chris Forbes <chrisf@ijw.co.nz>
 Installed-Size: {SIZE}
-Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity
+Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity, libsdl2 | libsdl2-2.0-0, liblua5.1-0
 Section: games
 Priority: extra
 Homepage: http://www.openra.net/
diff --git a/packaging/linux/deb/Eluant.dll.config b/packaging/linux/deb/Eluant.dll.config
new file mode 100644
index 0000000000..e1edf62646
--- /dev/null
+++ b/packaging/linux/deb/Eluant.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap os="linux" dll="lua51.dll" target="liblua5.1.so.0" />
+</configuration>
diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 3c996297ae..a843c0fff2 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -21,6 +21,7 @@ VERSION="$DATE.$TYPE"
 mkdir "${DEB_BUILD_ROOT}"
 cp -R DEBIAN "${DEB_BUILD_ROOT}"
 cp -R "${LINUX_BUILD_ROOT}/usr" "${DEB_BUILD_ROOT}"
+cp -R Eluant.dll.config "${DEB_BUILD_ROOT}/${LIBDIR}/"
 
 # Binaries go in /usr/games
 mv "${DEB_BUILD_ROOT}/usr/bin/" "${DEB_BUILD_ROOT}/usr/games/"
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index cc8319e9e8..ba5833bd5f 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -94,7 +94,7 @@ popd
 
 pushd linux
 echo "Building Linux packages"
-bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
+bash buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "Linux package build failed."
 fi