aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control4
-rw-r--r--debian/patches/0003-pkg-config-lua5.1.patch (renamed from debian/patches/0003-pkg-config-lua52.patch)10
-rw-r--r--debian/patches/series2
3 files changed, 7 insertions, 9 deletions
diff --git a/debian/control b/debian/control
index 1c5be6c..2f2436a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,7 @@ Maintainer: YAEGASHI Takeshi <yaegashi@debian.org>
5Build-Depends: debhelper (>= 9.0.0), 5Build-Depends: debhelper (>= 9.0.0),
6 pkg-config, 6 pkg-config,
7 libssl-dev, 7 libssl-dev,
8 libluajit-5.1-dev | liblua5.2-dev, 8 libluajit-5.1-dev | liblua5.1-dev,
9 curl,
10 ca-certificates,
11 asciidoc, 9 asciidoc,
12 libxml2-utils, 10 libxml2-utils,
13 xsltproc, 11 xsltproc,
diff --git a/debian/patches/0003-pkg-config-lua52.patch b/debian/patches/0003-pkg-config-lua5.1.patch
index 74151eb..753ba78 100644
--- a/debian/patches/0003-pkg-config-lua52.patch
+++ b/debian/patches/0003-pkg-config-lua5.1.patch
@@ -1,14 +1,14 @@
1From: YAEGASHI Takeshi <yaegashi@debian.org> 1From: YAEGASHI Takeshi <yaegashi@debian.org>
2Date: Tue, 18 Feb 2014 07:24:45 +0900 2Date: Tue, 18 Feb 2014 07:24:45 +0900
3Subject: pkg-config lua52 3Subject: pkg-config lua5.1
4 4
5pkg-config must use lua52.pc provided by liblua5.2-dev. 5pkg-config must use lua5.1.pc provided by liblua5.1-dev.
6--- 6---
7 cgit.mk | 4 ++-- 7 cgit.mk | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-) 8 1 file changed, 2 insertions(+), 2 deletions(-)
9 9
10diff --git a/cgit.mk b/cgit.mk 10diff --git a/cgit.mk b/cgit.mk
11index 056c3f9..41b514e 100644 11index 056c3f9..32238d4 100644
12--- a/cgit.mk 12--- a/cgit.mk
13+++ b/cgit.mk 13+++ b/cgit.mk
14@@ -31,8 +31,8 @@ ifdef NO_LUA 14@@ -31,8 +31,8 @@ ifdef NO_LUA
@@ -17,8 +17,8 @@ index 056c3f9..41b514e 100644
17 LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null) 17 LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
18-LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null) 18-LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
19-LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null) 19-LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
20+LUA_LIBS := $(shell pkg-config --libs lua52 2>/dev/null) 20+LUA_LIBS := $(shell pkg-config --libs lua5.1 2>/dev/null)
21+LUA_CFLAGS := $(shell pkg-config --cflags lua52 2>/dev/null) 21+LUA_CFLAGS := $(shell pkg-config --cflags lua5.1 2>/dev/null)
22 ifeq (JIT,$(LUA_IMPLEMENTATION)) 22 ifeq (JIT,$(LUA_IMPLEMENTATION))
23 ifeq ($(strip $(LUAJIT_LIBS)),) 23 ifeq ($(strip $(LUAJIT_LIBS)),)
24 $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.) 24 $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
diff --git a/debian/patches/series b/debian/patches/series
index 3d58fec..efbdfb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
10001-make-a2x-skip-xmllint.patch 10001-make-a2x-skip-xmllint.patch
20002-introduce-debian-standard-build-flags.patch 20002-introduce-debian-standard-build-flags.patch
30003-pkg-config-lua52.patch 30003-pkg-config-lua5.1.patch