X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=8ddd00286d7d8a1bedaafd4864b46687b57cbc87;hb=addf44f5319a9226b063c64b8c8993ed549d1f04;hp=996f23ce56d79cd11310ddb22cde23a7f52c9db1;hpb=05972e970514b4e7d0d75892d5457f2d99c6fd36;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 996f23c..8ddd002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,20 +19,17 @@ endif
 
 
 
-#Ruby versions to build for
-RUBY_VERS := 1.8 1.9
-RUBY_DEFAULT_VERS := 1.8
-
 PY_VERS := $(shell pyversions -vr)
 
 #tcl version we're building for
 TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \
 	| sed 's,.*\<tcl\([0-9.]*\)-dev\>.*,\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)
+DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
 else
@@ -46,7 +43,7 @@ CONFFLAGS += --disable-python --disable-ruby
 CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool
 
 #install perl libs in vendor mode
-CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor 
+CONFFLAGS += --with-perl-options="INSTALLDIRS=vendor INSTALL_BASE="
 
 #path to tcl
 CONFFLAGS += --with-tcllib=/usr/lib/tcl$(TCL_VERS)
@@ -57,7 +54,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
 else
 #don't optimize on arm for now - #447041
-ifneq ($(DEB_HOST_GNU_TYPE), arm)
+ifneq ($(DEB_HOST_ARCH_CPU), arm)
         CFLAGS += -O2
 endif
 endif
@@ -75,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 \
@@ -123,11 +122,15 @@ 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
 	rm -f intltool-extract intltool-merge intltool-update
 	rm -f src/librrd.sym
+	rm -f config.h
+
+	dh_autoreconf_clean
 
 	dh_clean
 
@@ -151,23 +154,20 @@ 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
+	rm debian/rrdtool/usr/share/doc/rrdtool/html/rrdcached.html
 
 	touch $@
 
 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
 
 install-python%: install-common-stamp
 	dh_testdir
@@ -186,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
@@ -207,15 +205,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