Merge branch 'experimental' of git.snow-crash.org:pkg-rrdtool into experimental

diff --git a/debian/control b/debian/control
index a23b09f55fb3bd163cb32bd14c6131107680ef41..4369ea15dad33624194f3905273af0a444052d44 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, gettext, quilt,
  perl (>= 5.8.0),
  python-all-dev (>= 2.3.5-10), python-all-dbg (>= 2.3.5-10),
  python-support (>= 0.7.1),
- ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
+ ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev,
+ liblua5.1-0-dev, lua5.1
 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/
@@ -205,3 +206,31 @@ Description: time-series data storage and display system (Ruby 1.9 interface)
  graphical representation of data values.
  .
  This package contains a Ruby 1.9 interface to RRDs.
+
+Package: liblua5.1-rrd0
+Architecture: any
+Section: interpreters
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: time-series data storage and display system (Lua 5.1 interface)
+ The Round Robin Database Tool (RRDtool) is a system to store and display
+ time-series data (e.g. network bandwidth, machine-room temperature,
+ server load average). It stores the data in Round Robin Databases (RRDs),
+ a very compact way that will not expand over time. RRDtool processes the
+ extracted data to enforce a certain data density, allowing for useful
+ graphical representation of data values.
+ .
+ This package contains a Lua 5.1 interface to RRDs.
+
+Package: liblua5.1-rrd-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.1-rrd0 (= ${binary:Version})
+Description: time-series data storage and display system (Lua 5.1 interface)
+ The Round Robin Database Tool (RRDtool) is a system to store and display
+ time-series data (e.g. network bandwidth, machine-room temperature,
+ server load average). It stores the data in Round Robin Databases (RRDs),
+ a very compact way that will not expand over time. RRDtool processes the
+ extracted data to enforce a certain data density, allowing for useful
+ graphical representation of data values.
+ .
+ This package contains development files for the Lua 5.1 interface to RRDs.

diff --git a/debian/liblua5.1-rrd-dev.install b/debian/liblua5.1-rrd-dev.install
new file mode 100644 (file)
index 0000000..fa54e3d
--- /dev/null
+++ b/debian/liblua5.1-rrd-dev.install
@@ -0,0 +1,3 @@
+usr/lib/lua/5.1/rrd.a
+usr/lib/lua/5.1/rrd.so
+usr/lib/lua/5.1/rrd.la

diff --git a/debian/liblua5.1-rrd0.install b/debian/liblua5.1-rrd0.install
new file mode 100644 (file)
index 0000000..4d4517b
--- /dev/null
+++ b/debian/liblua5.1-rrd0.install
@@ -0,0 +1,2 @@
+usr/lib/lua/5.1/rrd.so.0
+usr/lib/lua/5.1/rrd.so.0.0.0

diff --git a/debian/rules b/debian/rules
index 08677642a0aa4479f5c4484865b32b48fd45ab0d..91816b5a082480c078d3f83a56c78360c720c2c8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ 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)
@@ -69,6 +70,7 @@ endif
        LDFLAGS="$(LINKER_FLAGS)" \
        CFLAGS="$(CFLAGS)" \
        RRDDOCDIR=/usr/share/doc/rrdtool \
+       LUA=/usr/bin/$(LUA) \
          ./configure $(CONFFLAGS)
 
 build: build-arch build-indep