From: Bernd Zeimetz Date: Sun, 27 Sep 2009 23:30:47 +0000 (+0200) Subject: Build-conflict on lua50 as the lua binding autofoo stuff is buggy as hell. X-Git-Tag: experimental/1.4--rc2+20091004~21 X-Git-Url: https://git.tokkee.org/?p=pkg-rrdtool.git;a=commitdiff_plain;h=951e4c4ca26831f02e7ce145d662773482c8b192 Build-conflict on lua50 as the lua binding autofoo stuff is buggy as hell. --- diff --git a/debian/control b/debian/control index 4369ea1..1df16c8 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, gettext, quilt, python-support (>= 0.7.1), ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev, liblua5.1-0-dev, lua5.1 +Build-Conflicts: lua50 Homepage: http://oss.oetiker.ch/rrdtool/ Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary Vcs-Git: git://git.snow-crash.org/pkg-rrdtool.git/ diff --git a/debian/rules b/debian/rules index 91816b5..87e14da 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,6 @@ PY_VERS := $(shell pyversions -vr) TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \ | sed 's,.*\.*,\1,') -LUA = lua5.1 - #let's help configure to figure out our host/build system DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -70,7 +68,6 @@ endif LDFLAGS="$(LINKER_FLAGS)" \ CFLAGS="$(CFLAGS)" \ RRDDOCDIR=/usr/share/doc/rrdtool \ - LUA=/usr/bin/$(LUA) \ ./configure $(CONFFLAGS) build: build-arch build-indep