[neovim] 01/02: Fall back to lua5.1 if luajit/luajit-5.1-dev aren't available

James McCoy jamessan at debian.org
Sat Sep 24 17:49:59 UTC 2016


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

jamessan pushed a commit to branch debian/sid
in repository neovim.

commit efd0a5141d0889c8ca9fa81e97cacc63b88368f7
Author: James McCoy <jamessan at debian.org>
Date:   Sat Sep 24 12:54:48 2016 -0400

    Fall back to lua5.1 if luajit/luajit-5.1-dev aren't available
    
    Since luajit is only needed for unit tests, don't make it a hard
    requirement.
    
    Closes: #812741
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 084dcd2..c8c3697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+neovim (0.1.5-3) UNRELEASED; urgency=medium
+
+  * Add lua5.1 as alternative Build-Depends for luajit/libluajit-5.1-dev.
+    This should enable building on more architectures, at the expense of less
+    testing.  (Closes: #812741)
+
+ -- James McCoy <jamessan at debian.org>  Sat, 24 Sep 2016 12:53:34 -0400
+
 neovim (0.1.5-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index b50783b..2c59783 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends: autoconf,
                libacl1-dev,
                libjemalloc-dev [!hurd-any],
                libkvm-dev [kfreebsd-any],
-               lua5.1,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev | lua5.1,
                libmsgpack-dev (>= 1.0.0),
                libtermkey-dev,
                libunibilium-dev,
@@ -20,6 +19,7 @@ Build-Depends: autoconf,
                lua-bitop,
                lua-lpeg,
                lua-mpack,
+               luajit | lua5.1,
                ninja-build,
                pkg-config
 Standards-Version: 3.9.8

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/neovim.git



More information about the pkg-vim-maintainers mailing list