From c06fbc3b25e116fa79bcf94b6508010806ca3f14 Mon Sep 17 00:00:00 2001 From: YAEGASHI Takeshi <yaegashi@debian.org> Date: Sun, 2 Mar 2014 17:24:06 +0900 Subject: Update debian/patches diff --git a/debian/patches/0001-make-a2x-skip-xmllint.patch b/debian/patches/0001-make-a2x-skip-xmllint.patch index 38f48d5..9404554 100644 --- a/debian/patches/0001-make-a2x-skip-xmllint.patch +++ b/debian/patches/0001-make-a2x-skip-xmllint.patch @@ -8,10 +8,10 @@ Simply avoiding a2x failure caused by xmllint exit code 4 (Validation error). 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 2dc92df..1dac1ef 100644 +index 6fac5bd..63e38ab 100644 --- a/Makefile +++ b/Makefile -@@ -126,13 +126,13 @@ doc-html: $(DOC_HTML) +@@ -127,13 +127,13 @@ doc-html: $(DOC_HTML) doc-pdf: $(DOC_PDF) %.5 : %.5.txt diff --git a/debian/patches/0002-introduce-debian-standard-build-flags.patch b/debian/patches/0002-introduce-debian-standard-build-flags.patch index e4b7c6d..d3af5e3 100644 --- a/debian/patches/0002-introduce-debian-standard-build-flags.patch +++ b/debian/patches/0002-introduce-debian-standard-build-flags.patch @@ -8,10 +8,10 @@ See https://wiki.debian.org/Hardening 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1dac1ef..7e1381c 100644 +index 63e38ab..ff93147 100644 --- a/Makefile +++ b/Makefile -@@ -37,6 +37,10 @@ DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) +@@ -38,6 +38,10 @@ DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) # -include cgit.conf @@ -22,7 +22,7 @@ index 1dac1ef..7e1381c 100644 export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT # -@@ -65,7 +69,8 @@ endif +@@ -66,7 +70,8 @@ endif all:: cgit cgit: diff --git a/debian/patches/0003-pkg-config-lua5.1.patch b/debian/patches/0003-pkg-config-lua5.1.patch deleted file mode 100644 index 753ba78..0000000 --- a/debian/patches/0003-pkg-config-lua5.1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: YAEGASHI Takeshi <yaegashi@debian.org> -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-prefer-lua5.1-to-lua5.2.patch b/debian/patches/0003-prefer-lua5.1-to-lua5.2.patch new file mode 100644 index 0000000..774739c --- /dev/null +++ b/debian/patches/0003-prefer-lua5.1-to-lua5.2.patch @@ -0,0 +1,24 @@ +From: YAEGASHI Takeshi <yaegashi@debian.org> +Date: Sun, 2 Mar 2014 17:15:20 +0900 +Subject: prefer lua5.1 to lua5.2 + +Because: +* For wheezy, lua-md5 is not usable by lua 5.2 +* For sid, luajit is based on lua 5.1 +--- + cgit.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cgit.mk b/cgit.mk +index 5048b09..4fd4235 100644 +--- a/cgit.mk ++++ b/cgit.mk +@@ -30,7 +30,7 @@ ifdef NO_LUA + CGIT_CFLAGS += -DNO_LUA + else + ifeq ($(LUA_PKGCONFIG),) +- LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \ ++ LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.1 lua5.2; do \ + pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \ + done) + LUA_MODE := autodetected diff --git a/debian/patches/series b/debian/patches/series index 11ceafc..aaafe37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 0001-make-a2x-skip-xmllint.patch 0002-introduce-debian-standard-build-flags.patch -0003-pkg-config-lua5.1.patch +0003-prefer-lua5.1-to-lua5.2.patch 0004-rewrite-email-gravater.lua-using-md5.patch -- cgit v0.10.1