From fe14f4ee95f6e92f7f9a50c6e2b4ad7a3ee54073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 18 Feb 2016 17:27:13 +0000
Subject: Change lua stratumt to lua51

As lua versions seems to be incompatible

Change-Id: If80895139253a1df0946d3c9f878d93a3ed6da0f
---
 strata/enlightenment.morph                    |  2 +-
 strata/lua.morph                              | 16 ----------------
 strata/lua/lua.morph                          | 11 -----------
 strata/lua/luajit2.morph                      |  7 -------
 strata/lua51.morph                            | 16 ++++++++++++++++
 strata/lua51/lua51.morph                      | 11 +++++++++++
 strata/lua51/luajit2.morph                    |  7 +++++++
 systems/qt4-devel-system-x86_64-generic.morph |  4 ++--
 systems/qt5-devel-system-x86_64-generic.morph |  4 ++--
 9 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 strata/lua.morph
 delete mode 100644 strata/lua/lua.morph
 delete mode 100644 strata/lua/luajit2.morph
 create mode 100644 strata/lua51.morph
 create mode 100644 strata/lua51/lua51.morph
 create mode 100644 strata/lua51/luajit2.morph

diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index cf3d0e8b..61942884 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -4,7 +4,7 @@ description: Enlightenment Desktop and Window Manager
 build-depends:
 - morph: strata/tools.morph
 - morph: strata/x-generic.morph
-- morph: strata/lua.morph
+- morph: strata/lua51.morph
 - morph: strata/audio-bluetooth.morph
 - morph: strata/multimedia-gstreamer.morph
 - morph: strata/connman-common.morph
diff --git a/strata/lua.morph b/strata/lua.morph
deleted file mode 100644
index dcdd8801..00000000
--- a/strata/lua.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: lua
-kind: stratum
-description: Interpreter for the lua scripting language.
-build-depends:
-- morph: strata/tools.morph
-chunks:
-- name: lua
-  morph: strata/lua/lua.morph
-  repo: upstream:lua
-  ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
-  unpetrify-ref: baserock/5.1-morph
-- name: luajit2
-  morph: strata/lua/luajit2.morph
-  repo: upstream:luajit2
-  ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d
-  unpetrify-ref: v2.0.3
diff --git a/strata/lua/lua.morph b/strata/lua/lua.morph
deleted file mode 100644
index 32aeb5c1..00000000
--- a/strata/lua/lua.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: lua
-kind: chunk
-configure-commands:
-- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
-- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
-build-commands:
-- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
-install-commands:
-- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
-- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
-- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/lua/luajit2.morph b/strata/lua/luajit2.morph
deleted file mode 100644
index 72f34f02..00000000
--- a/strata/lua/luajit2.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: luajit2
-kind: chunk
-build-commands:
-- make PREFIX="$PREFIX"
-install-commands:
-- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
-
diff --git a/strata/lua51.morph b/strata/lua51.morph
new file mode 100644
index 00000000..b386fba8
--- /dev/null
+++ b/strata/lua51.morph
@@ -0,0 +1,16 @@
+name: lua51
+kind: stratum
+description: Interpreter for the lua scripting language.
+build-depends:
+- morph: strata/tools.morph
+chunks:
+- name: lua51
+  morph: strata/lua51/lua51.morph
+  repo: upstream:lua
+  ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
+  unpetrify-ref: baserock/5.1-morph
+- name: luajit2
+  morph: strata/lua51/luajit2.morph
+  repo: upstream:luajit2
+  ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d
+  unpetrify-ref: v2.0.3
diff --git a/strata/lua51/lua51.morph b/strata/lua51/lua51.morph
new file mode 100644
index 00000000..32aeb5c1
--- /dev/null
+++ b/strata/lua51/lua51.morph
@@ -0,0 +1,11 @@
+name: lua
+kind: chunk
+configure-commands:
+- sed -e 's/defined(LUA_USE_READLINE)/0/g' src/luaconf.h.orig >src/luaconf.h
+- sed -i -e '/^linux:/{n;s/-lreadline//g;s/-lhistory//g;s/-lncurses//g}' src/Makefile
+build-commands:
+- make debian_linux INSTALL_TOP="$PREFIX" RPATH="$PREFIX/lib"
+install-commands:
+- make INSTALL_TOP="$DESTDIR/$PREFIX" debian_install
+- mkdir -p "$DESTDIR/$PREFIX/lib/pkgconfig"
+- cp lua5.1.pc "$DESTDIR/$PREFIX/lib/pkgconfig/"
diff --git a/strata/lua51/luajit2.morph b/strata/lua51/luajit2.morph
new file mode 100644
index 00000000..72f34f02
--- /dev/null
+++ b/strata/lua51/luajit2.morph
@@ -0,0 +1,7 @@
+name: luajit2
+kind: chunk
+build-commands:
+- make PREFIX="$PREFIX"
+install-commands:
+- make install PREFIX="$PREFIX" DESTDIR="$DESTDIR"
+
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index e8230c88..d6a84fd6 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -30,8 +30,8 @@ strata:
   morph: strata/qt4-tools.morph
 - name: qt4-sdk
   morph: strata/qt4-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index b68faf79..90b6703a 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -32,8 +32,8 @@ strata:
   morph: strata/qt5-tools-qtwebkit.morph
 - name: qt5-sdk
   morph: strata/qt5-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
-- 
cgit v1.2.1