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

diff --git a/debian/rules b/debian/rules
index 9be66ae..7117f55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,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 
 
 
 
@@ -81,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
@@ -137,7 +138,6 @@ install-common-stamp: build-arch-stamp
 	dh_clean -k
 
 	make install DESTDIR=$(CURDIR)/debian/tmp
-	find debian/tmp
 	dh_install --sourcedir=$(CURDIR)/debian/tmp
 
 	touch $@
@@ -168,11 +168,10 @@ 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 -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev
 	dh_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
-	dh_installchangelogs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-	dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-	dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-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
@@ -187,6 +186,7 @@ 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-rrdtool