X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=4370644af5d347db963eecdc2e583882c90dbd0f;hb=615dcec32011f62525931e5f04490ff7e721ea04;hp=984cfa51f3c1cc00c08724086e1d771324e32b5e;hpb=395e1d0a3cdda0339d5476abd0437b20cd5098a6;p=yaz-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 984cfa5..4370644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ else
 SSL_FLAGS=
 endif
 
-YAZ_VERSION=1.8.7
+YAZ_VERSION=1.9.1
 YAZSRCDIR?=$(shell pwd)
 # If this is not IndexData's release, then it is a cvs-checkout. Go cheat!
 #   YAZ_VERSION:=$(YAZ_VERSION)-$(shell date -r$(YAZSRCDIR)/CVS +"CVS%Y%m%d")
@@ -40,7 +40,6 @@ LOCAL_LINK=-ldebian/yaz-runtime/usr/lib:debian/yaz-ssl/usr/lib
 $(YAZSRCDIR)/configure: $(YAZSRCDIR)/configure.in
 	cd $(YAZSRCDIR); sh buildconf.sh
 
-configure: stamp-configure
 stamp-configure: $(YAZSRCDIR)/configure
 	dh_testdir
 
@@ -85,7 +84,7 @@ stamp-install: stamp-build
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -p yaz-doc doc/
+	dh_installdocs -p yaz-doc doc/*.html doc/*.pdf doc/*.png
 	dh_installchangelogs -p yaz-doc
 	dh_link -p yaz-doc
 	dh_strip -p yaz-doc
@@ -103,7 +102,7 @@ binary-arch: build install
 ifeq ($(YAZ_WITH_SSL),1)
 	dh_movefiles -p yaz-ssl usr/bin/*ssl usr/lib/libyazssl* 
 endif
-	dh_movefiles -p yaz-devel  usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include 
+	dh_movefiles -p yaz-devel  usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include usr/bin/yaz-config usr/bin/yaz-comp
 	dh_movefiles -p yaz-runtime usr/lib usr/share/yaz usr/bin
 	dh_installexamples -p yaz-devel
 
@@ -119,7 +118,9 @@ endif
 
 	dh_installdeb -p yaz-runtime
 	dh_installdeb -p yaz-devel
-	dh_undocumented -p yaz-runtime yaz-client.1 yaz-comp.1 yaz-config.1 yaz-ztest.1 zoomsh.1
+	dh_installman -p yaz-devel doc/yaz-config.1
+	dh_undocumented -p yaz-devel yaz-comp.1
+	dh_installman -p yaz-runtime doc/yaz-client.1 doc/yaz-ztest.8 doc/yaz.7 doc/zoomsh.1
 	echo "libyaz 1 yaz-runtime" > debian/yaz-runtime/DEBIAN/shlibs
 	echo "libyazthread 1 yaz-runtime" >> debian/yaz-runtime/DEBIAN/shlibs
 	echo "libyazmalloc 1 yaz-runtime" >> debian/yaz-runtime/DEBIAN/shlibs
@@ -127,13 +128,12 @@ endif
 	dh_shlibdeps -p yaz-runtime $(LOCAL_LINK) 
 ifeq ($(YAZ_WITH_SSL),1)
 	dh_installdeb -p yaz-ssl
-	dh_undocumented -p yaz-ssl yaz-client-ssl.1 yaz-ztest-ssl.1
+	dh_installman -p yaz-ssl doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8
 	echo "libyazssl 1 yaz-ssl" >> debian/yaz-ssl/DEBIAN/shlibs
 	chmod 644 debian/yaz-ssl/DEBIAN/shlibs
 	dh_shlibdeps -p yaz-ssl $(LOCAL_LINK)
 	cat debian/postinst >> debian/yaz-ssl/DEBIAN/postinst
 endif
-	# Ugh Ugly hack
 	cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst
 
 	dh_gencontrol -p yaz-runtime