Build-conflict on lua50 as the lua binding autofoo stuff is buggy as hell.

diff --git a/debian/control b/debian/control
index 4369ea15dad33624194f3905273af0a444052d44..1df16c8faf65497fbd05deb17504f25bc60359ea 100644 (file)
--- 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 91816b5a082480c078d3f83a56c78360c720c2c8..87e14dac5b6e043651570df4cb2fe0bcaac771bb 100755 (executable)
--- 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,.*\<tcl\([0-9.]*\)-dev\>.*,\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