--- psiconv/trunk/debian/rules	2003/11/11 23:14:38	155
+++ psiconv/trunk/debian/rules	2004/02/04 17:37:10	202
@@ -23,7 +23,7 @@
 
 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 --mandir=/usr/share/man
+	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
@@ -57,14 +57,14 @@
  
 
 # Build architecture-dependent files here.
-binary-arch: build install psiconv-dev libpsiconv5 psiconv
+binary-arch: build install psiconv-dev libpsiconv6 psiconv
 
 psiconv-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_link -p $@
 	dh_strip -p $@
@@ -80,7 +80,7 @@
 	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_compress -p $@
 	dh_fixperms -p $@
@@ -89,7 +89,7 @@
 	dh_md5sums -p $@
 	dh_builddeb -p $@
 
-libpsiconv5:
+libpsiconv6:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/$@
@@ -102,6 +102,7 @@
 	dh_compress -p $@
 	dh_fixperms -p $@
 	dh_makeshlibs -p $@
+	dh_shlibdeps -p $@
 	dh_installdeb -p $@
 	dh_gencontrol -p $@
 	dh_md5sums -p $@
@@ -112,13 +113,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 $@
 	dh_link -p $@
 	dh_strip -p $@
 	dh_compress -p $@
 	dh_fixperms -p $@
+	dh_shlibdeps -p $@
 	dh_installdeb -p $@
 	dh_gencontrol -p $@
 	dh_md5sums -p $@