diff --git a/debian/rules b/debian/rules
index 996f23ce56d79cd11310ddb22cde23a7f52c9db1..040c37240496395af9ec933b699a1e49a991536c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
#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)
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
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
# 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
+ bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old bindings/perl-shared/MYMETA.yml
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_clean
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 $@
done
dh_installexamples -s
+ chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
install-python%: install-common-stamp
dh_testdir
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