- More dpkg fixes.

8 files changed, 15 insertions, 7 deletions

diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644
index 0000000..40eed80
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1 @@
+*.1.in
diff --git a/debian/control b/debian/control
index e07b9c2..d221449 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: plptools
-Build-Depends: debhelper, automake (>= 1:1.4-p4-1.1), autoconf, libtool, gettext, libncurses5-dev, libreadline4-dev, libnewt-dev, kdoc, libqt-dev, kdebase-dev
+Build-Depends: debhelper (>= 4.0.2), automake (>= 1:1.4-p4-1.1), autoconf, libtool, gettext, libncurses5-dev, libreadline4-dev, libnewt-dev, kdoc, libqt-dev, kdebase-dev
 Section: otherosfs
 Priority: optional
 Maintainer: John Lines <john@paladin.demon.co.uk>
diff --git a/debian/klipsi.dirs b/debian/klipsi.dirs
new file mode 100644
index 0000000..1da8fba
--- /dev/null
+++ b/debian/klipsi.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff --git a/debian/klipsi.files b/debian/klipsi.files
index 8ae4d8d..945f63c 100644
--- a/debian/klipsi.files
+++ b/debian/klipsi.files
@@ -6,3 +6,4 @@ usr/share/icons/*/*/apps/klipsi*
 usr/share/icons/*/*/actions/klipsi*
 usr/share/locale/*/LC_MESSAGES/klipsi.mo
 usr/share/man/man1/klipsi.1
+usr/share/lintian/overrides/klipsi
diff --git a/debian/plptools-kde.dirs b/debian/plptools-kde.dirs
new file mode 100644
index 0000000..1da8fba
--- /dev/null
+++ b/debian/plptools-kde.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff --git a/debian/plptools-kde.files b/debian/plptools-kde.files
index d6fe2f4..2cf544c 100644
--- a/debian/plptools-kde.files
+++ b/debian/plptools-kde.files
@@ -8,3 +8,4 @@ usr/share/icons/*/*/devices/*
 usr/share/icons/*/*/apps/psion*
 usr/share/locale/*/LC_MESSAGES/libplpprops.mo
 usr/share/mimelnk/*/*
+usr/share/lintian/overrides/plptools-kde
diff --git a/debian/plptools.postinst b/debian/plptools.postinst
index 5e36acb..93db761 100644
--- a/debian/plptools.postinst
+++ b/debian/plptools.postinst
@@ -24,7 +24,6 @@ set -e
 
 case "$1" in
     configure)
-	/sbin/ldconfig
 
     ;;
 
diff --git a/debian/rules b/debian/rules
index d2968a6..28c430f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ export DH_VERBOSE=1
 export DH_COMPAT=3
 
 tmp = $(shell pwd)/debian/tmp
+ltmp = $(tmp)/usr/share/lintian/overrides
 
 %.1: %.1.in
 	MANDATE=`grep CHECKIN $< | awk '{print $$4}'` ; \
@@ -57,13 +58,19 @@ install: build debian/kpsion.1 debian/klipsi.1
 	# install into debian/tmp.
 	$(MAKE) DESTDIR=$(tmp) install
 	install -d $(tmp)/etc
+	install -d $(ltmp)
 	install -m 644 debian/plptools.conf $(tmp)/etc
 	install -m 644 debian/kpsion.1 $(tmp)/usr/share/man/man1
 	install -m 644 debian/klipsi.1 $(tmp)/usr/share/man/man1
 	cp CHANGES obsolete-changes
 	cp ChangeLog changelog
+	for i in debian/*.override ; do \
+		mv $$i $(ltmp)/`basename $$i .override` ; \
+	done
+	for i in `find debian/ -type l -name "common"`; do \
+		rm -f $$i && ln -s ../common $$i ; \
+	done
 	# Split into sub-packages
-	cat CHANGES ChangeLog > changelog
 	dh_movefiles -pplptools
 	dh_movefiles -pplptools-dev
 	dh_movefiles -pplptools-kde
@@ -97,10 +104,7 @@ binary-arch: build install
 	dh_fixperms
 	# You may want to make some executables suid here.
 #	dh_suidregister
-	dh_makeshlibs -a -V -pplptools
-	dh_makeshlibs -a -V -pplptools-kde
-	dh_makeshlibs -a -V -pkpsion
-	dh_makeshlibs -a -V -pklipsi
+	dh_makeshlibs -a -V
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps