X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=f9b33eb99df2cc0ce5b30be226a6ff111435957a;hb=e11e1d9e133af55ba591333f9ffd82f575cbe8cf;hp=91816b5a082480c078d3f83a56c78360c720c2c8;hpb=06ef6a573e296977f34f9153039a377fb96c407b;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 91816b5..f9b33eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,20 @@
 #we use quilt
 include /usr/share/quilt/quilt.make
 
+#needed to build with Python 2.6
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+  py_setup_install_args = 
+endif
+
+
 
 #Ruby versions to build for
-RUBY_VERS := 1.8 1.9
+RUBY_VERS := 1.8 1.9.1
 RUBY_DEFAULT_VERS := 1.8
 
 PY_VERS := $(shell pyversions -vr)
@@ -18,8 +29,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 +79,6 @@ endif
 	LDFLAGS="$(LINKER_FLAGS)" \
 	CFLAGS="$(CFLAGS)" \
 	RRDDOCDIR=/usr/share/doc/rrdtool \
-	LUA=/usr/bin/$(LUA) \
 	  ./configure $(CONFFLAGS)
 
 build: build-arch build-indep 
@@ -145,7 +153,7 @@ install-common-stamp: build-arch-stamp
 	make install DESTDIR=$(CURDIR)/debian/tmp
 	# we don't want .txt and .pod documentation in the package
 	rm -rf debian/tmp/usr/share/doc/rrdtool/txt
-	dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+	dh_install --sourcedir=$(CURDIR)/debian/tmp -X.la --fail-missing
 	# remove duplicates
 	rm debian/rrdtool/usr/bin/rrdcached
 	rm debian/rrdtool/usr/share/man/man1/rrdcached.1
@@ -173,8 +181,11 @@ install-python%: install-common-stamp
 	dh_testroot
 	set -e ;\
 	 cd bindings/python ;\
-	 python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool ;\
-	 python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg
+	 python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool \
+		$(py_setup_install_args) ;\
+	 python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg \
+		$(py_setup_install_args)
+
 	find $(CURDIR)/debian/rrdtool-dbg -type f -name '*.egg-info' -print0 |\
 		 xargs -0r rm -f
 
@@ -203,15 +214,17 @@ binary-arch: build-arch install-arch
 	dh_installdocs -a -A CONTRIBUTORS NEWS
 	dh_installdocs -a
 	echo 'tcl:Depends=tcl$(TCL_VERS) | tclsh' >> debian/rrdtool-tcl.substvars
-	dh_pysupport -ppython-rrdtool
-	dh_pysupport -prrdtool-dbg
+	dh_python2 -ppython-rrdtool
+	dh_python2 -prrdtool-dbg
 	dh_perl -a
 	dh_installman -a
+	dh_installinit -prrdcached
 	dh_link -a
 	dh_strip -a --dbg-package=rrdtool-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a
+	dh_makeshlibs -a -Nliblua5.1-rrd0 -Nliblua5.1-rrd-dev
+	dh_makeshlibs -pliblua5.1-rrd0 -pliblua5.1-rrd-dev -n
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a