X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=debian%2Frules;h=ffb311d2d3867f2852bae7de4e9c7457494de217;hp=f5232c22dc111094b24097149e3995c4733da336;hb=a040a2caa54445509bb70c14b57dffe3bbd0fcf4;hpb=2309bff1f17207f5952803760becd2390f7f8ea3

diff --git a/debian/rules b/debian/rules
index f5232c2..ffb311d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 export DH_COMPAT=2
 
 YAZ_WITH_SSL?=1
-CONFIG_FLAGS=--enable-static --enable-shared --enable-tcpd --prefix=/usr
+CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr
 
 # Enable parallel builds if CONCURRENCY_LEVEL is set
 ifdef CONCURRENCY_LEVEL
@@ -28,7 +28,7 @@ else
 SSL_FLAGS=
 endif
 
-YAZ_VERSION=1.9.1
+YAZ_VERSION=1.9.3
 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,21 +118,22 @@ 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
-	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
+	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 2 yaz-runtime (>= 1.9.3)" > debian/yaz-runtime/DEBIAN/shlibs
+	echo "libyazthread 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs
+	echo "libyazmalloc 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs
 	chmod 644 debian/yaz-runtime/DEBIAN/shlibs
 	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
-	echo "libyazssl 1 yaz-ssl" >> debian/yaz-ssl/DEBIAN/shlibs
+	dh_installman -p yaz-ssl doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8
+	echo "libyazssl 2 yaz-ssl (>= 1.9.3)" >> 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