X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=7117f55039f61accefa418ff7b0ceeed5dd2f855;hb=a6b145c9d9f85c0043cec9a41d4539f17f295c87;hp=72619979bac326c5e620253f68caf00ade9df668;hpb=563d4bf48eae9415e990ffbd84a72381232a2464;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 7261997..7117f55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+#we use quilt
+include /usr/share/quilt/quilt.make
+
 
 #library versions
 LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
@@ -41,8 +44,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 
 
 
 
@@ -57,7 +59,7 @@ endif
 LDFLAGS="-Wl,-z,defs"
 
 configure: config.status
-config.status:
+config.status: $(QUILT_STAMPFN)
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -78,6 +80,8 @@ build-arch-stamp: config.status
 
 	#configure forgets to set TCL_INC_DIR.
 	make TCL_INC_DIR=/usr/include/tcl
+	#Fix library path to tcl bindings
+	sed -i -e 's|lib/|lib/tcltk/rrdtool-tcl/|' bindings/tcl/pkgIndex.tcl
 	touch $@
 
 build-python%: build-arch-stamp
@@ -86,10 +90,11 @@ build-python%: build-arch-stamp
 	 BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
 	touch $@
 
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
+build-indep: build-arch-stamp
+	#indep stuff is built in build-arch-stamp, too.
 
-clean: $(PY_VERS:%=clean-python%)
+clean: clean-patched
+clean-patched: unpatch $(PY_VERS:%=clean-python%)
 	dh_testdir
 	dh_testroot
 	#sanity check if debian/control lists the right package name
@@ -103,7 +108,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	rm -f config.guess
 endif
-	rm -f build-arch-stamp build-indep-stamp config.status
+	rm -f build-arch-stamp build-indep-stamp config.status install-common-stamp
 	find . -name \*.pyc | xargs rm -f
 	rm -rf bindings/python/build
 
@@ -115,22 +120,29 @@ endif
 
 	dh_clean
 
-clean-python%:
+clean-python%: unpatch
 	set -e ;\
 	 cd bindings/python ;\
 	 python$* setup.py clean
 	rm -f build-python$*
 
-install: install-arch
 
-install-arch: $(PY_VERS:%=install-python%)
+install: install-arch install-indep
+
+install-indep: build-indep install-common-stamp
+	#nothing to do
+
+install-common-stamp: build-arch-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s -Npython-rrd
-	dh_installdirs -s
+	dh_clean -k
 
 	make install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=$(CURDIR)/debian/tmp
 
+	touch $@
+
+install-arch: install-common-stamp $(PY_VERS:%=install-python%)
 	#build and install ruby
 	set -e; \
 	cd bindings/ruby ;\
@@ -142,26 +154,25 @@ install-arch: $(PY_VERS:%=install-python%)
 	  make distclean ;\
 	done
 
-	dh_install -s --sourcedir=$(CURDIR)/debian/tmp
 	dh_installexamples -s
 
-install-python%:
+install-python%: install-common-stamp
 	dh_testdir
 	dh_testroot
 	set -e ;\
 	 cd bindings/python ;\
-	 python$* setup.py install --root=$(CURDIR)/debian/python-rrd
+	 python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool
 
 
-binary-indep:
+binary-indep: build-indep install-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
 	dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
-	dh_link -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev
-	dh_installchangelogs
-	dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev
-	dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev
+	dh_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
+	dh_installchangelogs -i -Nlibrrd-ruby -Npython-rrd
+	dh_installdocs -i -Nlibrrd-ruby -Npython-rrd
+	dh_link -i -Nlibrrd-ruby -Npython-rrd
+	echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
 	dh_perl -i
 	dh_compress -i
 	dh_fixperms -i
@@ -175,12 +186,12 @@ binary-arch: build-arch install-arch
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -a CHANGES
+	dh_installdocs -A CONTRIBUTORS
 	dh_installdocs -a
 #	dh_installexamples -a
-	dh_pysupport -ppython-rrd
+	dh_pysupport -ppython-rrdtool
 	dh_perl -a
 	dh_installman -a
-	echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
 	dh_link -plibrrd-dev /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so
 	dh_link -plibrrd-dev /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
 	dh_link -plibrrd$(LIB_major) /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
@@ -201,4 +212,4 @@ binary: binary-arch binary-indep
 .PHONY: build clean configure \
         binary-indep binary-arch binary \
         install install-arch \
-        install-python% clean-python%
+        install-python% clean-python% unpatch