From a68fc66f7f9c5eb4965c5e2d38ef12fb504b2bc0 Mon Sep 17 00:00:00 2001 From: YAEGASHI Takeshi Date: Thu, 20 Feb 2014 01:56:43 +0900 Subject: Use liblua5.1-dev in wheezy to improve module usability Fix 0003-pkg-config-lua5.1.patch. Remove curl and ca-certificates from Build-Depends. 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 Build-Depends: debhelper (>= 9.0.0), pkg-config, libssl-dev, - libluajit-5.1-dev | liblua5.2-dev, - curl, - ca-certificates, + libluajit-5.1-dev | liblua5.1-dev, asciidoc, libxml2-utils, xsltproc, diff --git a/debian/patches/0003-pkg-config-lua5.1.patch b/debian/patches/0003-pkg-config-lua5.1.patch new file mode 100644 index 0000000..753ba78 --- /dev/null +++ b/debian/patches/0003-pkg-config-lua5.1.patch @@ -0,0 +1,24 @@ +From: YAEGASHI Takeshi +Date: Tue, 18 Feb 2014 07:24:45 +0900 +Subject: pkg-config lua5.1 + +pkg-config must use lua5.1.pc provided by liblua5.1-dev. +--- + cgit.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cgit.mk b/cgit.mk +index 056c3f9..32238d4 100644 +--- a/cgit.mk ++++ b/cgit.mk +@@ -31,8 +31,8 @@ ifdef NO_LUA + else + LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null) + LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null) +-LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null) +-LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null) ++LUA_LIBS := $(shell pkg-config --libs lua5.1 2>/dev/null) ++LUA_CFLAGS := $(shell pkg-config --cflags lua5.1 2>/dev/null) + ifeq (JIT,$(LUA_IMPLEMENTATION)) + ifeq ($(strip $(LUAJIT_LIBS)),) + $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.) diff --git a/debian/patches/0003-pkg-config-lua52.patch b/debian/patches/0003-pkg-config-lua52.patch deleted file mode 100644 index 74151eb..0000000 --- a/debian/patches/0003-pkg-config-lua52.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: YAEGASHI Takeshi -Date: Tue, 18 Feb 2014 07:24:45 +0900 -Subject: pkg-config lua52 - -pkg-config must use lua52.pc provided by liblua5.2-dev. ---- - cgit.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cgit.mk b/cgit.mk -index 056c3f9..41b514e 100644 ---- a/cgit.mk -+++ b/cgit.mk -@@ -31,8 +31,8 @@ ifdef NO_LUA - else - LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null) - LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null) --LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null) --LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null) -+LUA_LIBS := $(shell pkg-config --libs lua52 2>/dev/null) -+LUA_CFLAGS := $(shell pkg-config --cflags lua52 2>/dev/null) - ifeq (JIT,$(LUA_IMPLEMENTATION)) - ifeq ($(strip $(LUAJIT_LIBS)),) - $(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 @@ 0001-make-a2x-skip-xmllint.patch 0002-introduce-debian-standard-build-flags.patch -0003-pkg-config-lua52.patch +0003-pkg-config-lua5.1.patch -- cgit v0.10.1