X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=51c465aabe4ad90c27504d4e0bb16bcc0ba5338a;hb=3a2124aa85eea0583c7528bcc6f79a5fa1632a40;hp=7c99721748594fb8d09874e45407d7a4a286746e;hpb=b5b9a40216a338472c3410c8e2554a7a8a900a60;p=idzebra-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 7c99721..51c465a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=4
 
-CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yazconfig=/usr/bin --prefix=/usr
+CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yaz=/usr/bin --prefix=/usr
 
 # Enable parallel builds if CONCURRENCY_LEVEL is set
 ifdef CONCURRENCY_LEVEL
@@ -20,11 +20,7 @@ else
 MCFLAGS=
 endif
 
-ZEBRA_VERSION=1.3.2
 ZEBRASRCDIR?=$(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")
-export ZEBRA_VERSION
 
 # Local library path for linking with right dependencies
 LOCAL_LINK=-ldebian/idzebra/usr/lib
@@ -32,7 +28,6 @@ LOCAL_LINK=-ldebian/idzebra/usr/lib
 $(ZEBRASRCDIR)/configure: $(ZEBRASRCDIR)/configure.in
 	cd $(ZEBRASRCDIR); sh buildconf.sh
 
-configure: stamp-configure
 stamp-configure: $(ZEBRASRCDIR)/configure
 	dh_testdir
 
@@ -76,7 +71,8 @@ stamp-install: stamp-build
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -p idzebra-doc doc/
+	#dh_installdocs -p idzebra-doc doc/*.html doc/*.pdf doc/*.png
+	dh_installdocs -p idzebra-doc debian/tmp/usr/share/doc/idzebra/*.html debian/tmp/usr/share/doc/idzebra/*.pdf debian/tmp/usr/share/doc/idzebra/*.png
 	dh_installchangelogs -p idzebra-doc
 	dh_link -p idzebra-doc
 	dh_strip -p idzebra-doc
@@ -93,21 +89,24 @@ binary-arch: build install
 	dh_testroot
 	dh_movefiles -p idzebra usr/share/idzebra usr/bin
 
-	cp CHANGELOG changelog
+	cp NEWS changelog
 	dh_installdocs --all README TODO changelog debian/copyright
 
 	dh_installchangelogs
 	dh_link
+
+	dh_installdeb -p idzebra
+	#dh_installman -p idzebra doc/zebraidx.1 doc/zebrasrv.8
+	dh_installman -p idzebra debian/tmp/usr/share/man/man1/zebraidx.1 debian/tmp/usr/share/man/man8/zebrasrv.8
+
 	dh_strip
 	dh_compress -a
 	dh_fixperms -a
 
-	dh_installdeb -p idzebra
-	dh_undocumented -p idzebra zebraidx.1 zebrasrv.1
 	dh_shlibdeps -p idzebra $(LOCAL_LINK) 
 
-	# Ugh Ugly hack
 	cat debian/postinst >> debian/idzebra/DEBIAN/postinst
+	chmod +x debian/idzebra/DEBIAN/postinst
 
 	dh_gencontrol -p idzebra
 	dh_md5sums -p idzebra
@@ -120,7 +119,6 @@ binary-arch: build install
 
 	dh_builddeb -p idzebra
 
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install install-stamp configure