--- psiconv/trunk/debian/rules	2003/11/11 22:49:43	154
+++ psiconv/trunk/debian/rules	2004/02/21 13:11:57	215
@@ -23,13 +23,13 @@
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-ascii-docs --datadir=/usr/share/doc
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-ascii-docs --datadir=/usr/share/doc --mandir=/usr/share/man --with-etcdir=/etc/psiconv
 
 
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
-	$(MAKE)
+	$(MAKE) pkgdatadir=/usr/share/doc/psiconv-doc
 	touch build-stamp
 
 clean:
@@ -49,7 +49,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp pkgdatadir=/usr/share/doc/psiconv-doc
 
 
 # Build architecture-independent files here.
@@ -57,15 +57,16 @@
  
 
 # Build architecture-dependent files here.
-binary-arch: build install psiconv-dev libpsiconv5 psiconv
+binary-arch: build install libpsiconv-dev libpsiconv6 psiconv
 
-psiconv-dev:
+libpsiconv-dev:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/$@
 	dh_installdirs -p $@
-	ln -sfn libpsiconv5 debian/$@/usr/share/doc/$@
+	ln -sfn libpsiconv6 debian/$@/usr/share/doc/$@
 	dh_install -p $@ --sourcedir debian/tmp
+	dh_installman -p $@
 	dh_link -p $@
 	dh_strip -p $@
 	dh_compress -p $@
@@ -80,8 +81,9 @@
 	dh_testroot
 	rm -rf debian/$@
 	dh_installdirs -p $@
-	ln -sfn libpsiconv5 debian/$@/usr/share/doc/$@
+	dh_installdocs -p $@
 	dh_install -p $@ --sourcedir debian/tmp
+	dh_installchangelogs -p $@
 	dh_compress -p $@
 	dh_fixperms -p $@
 	dh_installdeb -p $@
@@ -89,18 +91,20 @@
 	dh_md5sums -p $@
 	dh_builddeb -p $@
 
-libpsiconv5:
+libpsiconv6:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/$@
 	dh_installdirs -p $@
 	dh_installdocs -p $@
 	dh_install -p $@ --sourcedir debian/tmp
+	dh_installchangelogs -p $@
 	dh_link -p $@
 	dh_strip -p $@
 	dh_compress -p $@
 	dh_fixperms -p $@
 	dh_makeshlibs -p $@
+	dh_shlibdeps -p $@
 	dh_installdeb -p $@
 	dh_gencontrol -p $@
 	dh_md5sums -p $@
@@ -111,13 +115,14 @@
 	dh_testroot
 	rm -rf debian/$@
 	dh_installdirs -p $@
-	ln -sfn libpsiconv5 debian/$@/usr/share/doc/$@
+	ln -sfn libpsiconv6 debian/$@/usr/share/doc/$@
 	dh_install -p $@ --sourcedir debian/tmp
-	dh_installman -p $@ --sourcedir debian/tmp
+	dh_installman -p $@
 	dh_link -p $@
 	dh_strip -p $@
 	dh_compress -p $@
 	dh_fixperms -p $@
+	dh_shlibdeps -p $@
 	dh_installdeb -p $@
 	dh_gencontrol -p $@
 	dh_md5sums -p $@