X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=6430e061c28ccc5edb064bc0038e38e2f36ccf78;hb=202015964891023f69e3e6b12c51c3faada7e749;hp=6e8b142630c88e7287a849b84add04c353617f0c;hpb=e4e1185a2c3b6f91d0c6c2f6110c6dea57cb840b;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 6e8b142..6430e06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,20 +12,17 @@ include /usr/share/quilt/quilt.make
 RUBY_VERS := 1.8 1.9
 RUBY_DEFAULT_VERS := 1.8
 
-#Python versions to build for. The work-around-doko way.
-PY_VERS := $(shell set -e; \
-                   for py in `pysupport-parseversions debian/pyversions`; do \
-                       if [ -x /usr/bin/python$$py ]; then echo $$py; fi;    \
-                   done)
+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
@@ -50,7 +47,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,7 +72,7 @@ endif
 
 build: build-arch build-indep 
 
-build-arch: build-arch-stamp $(PY_VERS:%=build-python%)
+build-arch: build-arch-stamp $(PY_VERS:%=build-python%) $(PY_VERS:%=build-python%-dbg)
 build-arch-stamp: config.status 
 	make
 	#Fix library path to tcl bindings
@@ -90,14 +87,14 @@ build-arch-stamp: config.status
 build-python%: build-arch-stamp
 	set -e ;\
 	 cd bindings/python ;\
-	 BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
-	touch $@
+	 BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build ;\
+	 touch $@
 
 build-indep: build-arch-stamp
 	#indep stuff is built in build-arch-stamp, too.
 
 clean: clean-patched
-clean-patched: unpatch $(PY_VERS:%=clean-python%)
+clean-patched: unpatch $(PY_VERS:%=clean-python%) $(PY_VERS:%=clean-python%-dbg)
 	dh_testdir
 	dh_testroot
 
@@ -121,14 +118,15 @@ endif
 	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
 
 clean-python%: unpatch
 	set -e ;\
 	 cd bindings/python ;\
-	 python$* setup.py clean
-	rm -f build-python$*
+	 python$* setup.py clean ;\
+	 rm -f build-python$*
 
 
 install: install-arch install-indep
@@ -142,7 +140,13 @@ install-common-stamp: build-arch-stamp
 	dh_clean -k
 
 	make install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
+	# 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
+	# 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 $@
 
@@ -159,23 +163,26 @@ install-arch: install-common-stamp $(PY_VERS:%=install-python%)
 	done
 
 	dh_installexamples -s
+	chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
 
 install-python%: install-common-stamp
 	dh_testdir
 	dh_testroot
 	set -e ;\
 	 cd bindings/python ;\
-	 python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool
+	 python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool ;\
+	 python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg
+	find $(CURDIR)/debian/rrdtool-dbg -type f -name '*.egg-info' -print0 |\
+		 xargs -0r rm -f
 
 
 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_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
-	dh_installchangelogs -i -Nlibrrd-ruby -Npython-rrd CHANGES
-	dh_installdocs -i -Nlibrrd-ruby -Npython-rrd -A CONTRIBUTORS NEWS
-	dh_link -i -Nlibrrd-ruby -Npython-rrd
+	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_perl -i
 	dh_compress -i
@@ -194,13 +201,16 @@ binary-arch: build-arch install-arch
 	dh_installdocs -a
 	echo 'tcl:Depends=tcl$(TCL_VERS) | tclsh' >> debian/rrdtool-tcl.substvars
 	dh_pysupport -ppython-rrdtool
+	dh_pysupport -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