X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=78962200dbf289e54427d90bb28ab010652aa38d;hb=a72b8d2b8d795cf1c043631e595854b2302d55aa;hp=6178929965ac2919084165c0a142c97860fcebf8;hpb=75b42449ab08d70857fe57c910db27938368a9df;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 6178929..7896220 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,6 @@ endif
 
 
 
-#Ruby versions to build for
-RUBY_VERS := 1.8 1.9.1
-RUBY_DEFAULT_VERS := 1.8
-
 PY_VERS := $(shell pyversions -vr)
 
 #tcl version we're building for
@@ -76,6 +72,8 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+	dh_autoreconf
+
 	LDFLAGS="$(LINKER_FLAGS)" \
 	CFLAGS="$(CFLAGS)" \
 	RRDDOCDIR=/usr/share/doc/rrdtool \
@@ -124,6 +122,7 @@ endif
 	# clean what the Makefiles do not clean ...
 	rm -rf bindings/perl-piped/blib bindings/perl-shared/blib \
 	       bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old
+	rm -f bindings/perl-shared/MYMETA.yml bindings/perl-shared/MYMETA.json
 	rm -f bindings/tcl/pkgIndex.tcl bindings/tcl/tclrrd*.so
 	rm -f examples/cgi-demo.cgi
 	rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt
@@ -131,6 +130,8 @@ endif
 	rm -f src/librrd.sym
 	rm -f config.h
 
+	dh_autoreconf_clean
+
 	dh_clean
 
 clean-python%: unpatch
@@ -163,15 +164,7 @@ install-common-stamp: build-arch-stamp
 
 install-arch: install-common-stamp $(PY_VERS:%=install-python%)
 	#build and install ruby
-	set -e; \
-	cd bindings/ruby ;\
-	for rbv in $(RUBY_VERS); do \
-	  ruby$$rbv extconf.rb ;\
-	  make ;\
-	  make install sitelibdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["rubylibdir"]'` \
-	               sitearchdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["archdir"]'` ;\
-	  make distclean ;\
-	done
+	dh_ruby --install
 
 	dh_installexamples -s
 	chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
@@ -193,11 +186,9 @@ install-python%: install-common-stamp
 binary-indep: build-indep install-indep
 	dh_testdir
 	dh_testroot
-	dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
-	dh_installchangelogs -i -Nlibrrd-ruby CHANGES
-	dh_installdocs -i -Nlibrrd-ruby -A CONTRIBUTORS NEWS
-	dh_link -i -Nlibrrd-ruby
-	echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
+	dh_installchangelogs -i CHANGES
+	dh_installdocs -i -A CONTRIBUTORS NEWS
+	dh_link -i
 	dh_perl -i
 	dh_compress -i
 	dh_fixperms -i
@@ -214,8 +205,8 @@ 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