- Ongoing dpkg development

13 files changed, 152 insertions, 15 deletions

diff --git a/debian/control b/debian/control
index 1e6a075..e07b9c2 100644
--- a/debian/control
+++ b/debian/control
@@ -22,11 +22,12 @@ Architecture: any
 Section: devel
 Depends: plptools (= ${Source-Version})
 Description: plptools (development files)
-  You need these files if you want to build programs which use libplp.
+ You need these files if you want to build programs which use libplp.
 
 Package: plptools-kde
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-libs, konqueror
+Enhances: kdebase
 Description: KDE integration of plptools
  This package provides integrated access to a Psion PDA into KDE
  Using a kioslave, any KDE compliant application can access files on
diff --git a/debian/klipsi.1.in.in b/debian/klipsi.1.in.in
new file mode 100644
index 0000000..77e04cf
--- /dev/null
+++ b/debian/klipsi.1.in.in
@@ -0,0 +1,51 @@
+.\" Manual page for klipsi
+.\" $Id$
+.\" CHECKIN $Date$
+.\"
+.\" Process this file with
+.\" groff -man -Tascii klipsi.1 for ASCII output, or
+.\" groff -man -Tps klipsi.1 for PostScript output
+.\"
+.TH klipsi "1" "@MANDATE@" "plptools @VERSION@" "User Commands"
+.SH NAME
+klipsi \- Psion remote clipboard utility for KDE
+.SH SYNOPSIS
+.B klipsi
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+klipsi is a KDE systemtray application which shares the clipboard with
+a remotely connected Psion PDA. Normally it is started without any
+arguments. For completeness, here a its standard options.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH SEE ALSO
+.TP
+ncpd(8), plpnfsd(8), plpprintd(8), plpbackup(1), plpftp(1), sisinstall(1) and kpsion(1)
+.SH AUTHOR
+Fritz Elfert <felfert@users.sourceforge.net>
+.PP
+KDE: 2.2.2
+Klipsi: 0.11
diff --git a/debian/klipsi.files b/debian/klipsi.files
index 79f66d9..8ae4d8d 100644
--- a/debian/klipsi.files
+++ b/debian/klipsi.files
@@ -5,3 +5,4 @@ usr/share/apps/klipsi/*
 usr/share/icons/*/*/apps/klipsi*
 usr/share/icons/*/*/actions/klipsi*
 usr/share/locale/*/LC_MESSAGES/klipsi.mo
+usr/share/man/man1/klipsi.1
diff --git a/debian/klipsi.override b/debian/klipsi.override
new file mode 100644
index 0000000..b8d8f62
--- /dev/null
+++ b/debian/klipsi.override
@@ -0,0 +1,2 @@
+klipsi: no-shlibs-control-file usr/lib/klipsi.so
+klipsi: postinst-must-call-ldconfig usr/lib/klipsi.so
diff --git a/debian/kpsion.1.in.in b/debian/kpsion.1.in.in
new file mode 100644
index 0000000..ffaa137
--- /dev/null
+++ b/debian/kpsion.1.in.in
@@ -0,0 +1,64 @@
+.\" Manual page for kpsion
+.\" $Id$
+.\" CHECKIN $Date$
+.\"
+.\" Process this file with
+.\" groff -man -Tascii kpsion.1 for ASCII output, or
+.\" groff -man -Tps kpsion.1 for PostScript output
+.\"
+.TH kpsion "1" "@MANDATE@" "plptools @VERSION@" "User Commands"
+.SH NAME
+kpsion \- Psion connectivity utility for KDE.
+.SH SYNOPSIS
+.B kpsion
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR]
+.SH DESCRIPTION
+kpsion provides a backup, restore and formatting facility for a Psion PDA,
+connected to the local or a remote machine. A full documentation is
+provided via KDEs standard online help.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-\-autobackup\fR
+perform scheduled backup
+.TP
+\fB\-\-backup\fR <drv>
+perform backup
+.TP
+\fB\-\-restore\fR <drv>
+perform restore
+.TP
+\fB\-\-format\fR <drv>
+format drive
+.SH SEE ALSO
+.TP
+ncpd(8), plpnfsd(8), plpprintd(8), plpbackup(1), plpftp(1), sisinstall(1) and klipsi(1)
+.SH AUTHOR
+Fritz Elfert <felfert@users.sourceforge.net>
+.PP
+KDE: 2.2.2
+KPsion: 0.11
diff --git a/debian/kpsion.files b/debian/kpsion.files
index 65779b8..b5e53b5 100644
--- a/debian/kpsion.files
+++ b/debian/kpsion.files
@@ -1,5 +1,6 @@
 usr/bin/kpsion
-usr/lib/libkpsion.*
+usr/lib/libkpsion.so.*
+usr/lib/libkpsion.la
 usr/share/applnk/*/kpsion*
 usr/share/apps/kpsion/*
 usr/share/apps/konqueror/*
@@ -7,3 +8,4 @@ usr/share/icons/*/*/apps/kpsion*
 usr/share/icons/*/*/actions/psion*
 usr/share/locale/*/LC_MESSAGES/kpsion.mo
 usr/share/doc/HTML/*/kpsion
+usr/share/man/man1/kpsion.1
diff --git a/debian/plptools-dev.docs b/debian/plptools-dev.docs
index 9d002f6..c60ad0d 100644
--- a/debian/plptools-dev.docs
+++ b/debian/plptools-dev.docs
@@ -2,3 +2,4 @@ etc/psidump*
 etc/*magic*
 etc/ttytap.c
 doc/api
+patches
diff --git a/debian/plptools-kde.files b/debian/plptools-kde.files
index f90dfdc..d6fe2f4 100644
--- a/debian/plptools-kde.files
+++ b/debian/plptools-kde.files
@@ -1,6 +1,6 @@
-usr/lib/kio_plp.so*
+usr/lib/kio_plp.so
 usr/lib/kio_plp.la
-usr/lib/libplpprops.so*
+usr/lib/libplpprops.so.*
 usr/lib/libplpprops.la
 usr/share/services/*
 usr/share/icons/*/*/mimetypes/*
diff --git a/debian/plptools-kde.override b/debian/plptools-kde.override
new file mode 100644
index 0000000..91fbc72
--- /dev/null
+++ b/debian/plptools-kde.override
@@ -0,0 +1 @@
+plptools-kde: shlib-missing-in-control-file kio_plp.so usr/lib/kio_plp.so
diff --git a/debian/plptools.conffiles b/debian/plptools.conffiles
index f3d46d9..1a6c30a 100644
--- a/debian/plptools.conffiles
+++ b/debian/plptools.conffiles
@@ -1 +1 @@
-etc/plptools.conf
+/etc/plptools.conf
diff --git a/debian/plptools.docs b/debian/plptools.docs
index 272bb94..f357735 100644
--- a/debian/plptools.docs
+++ b/debian/plptools.docs
@@ -1,4 +1,4 @@
 README
 TODO
-CHANGES
-ChangeLog
+changelog
+obsolete-changes
diff --git a/debian/plptools.files b/debian/plptools.files
index 121f2ee..637c5e9 100644
--- a/debian/plptools.files
+++ b/debian/plptools.files
@@ -5,6 +5,8 @@ usr/bin/sisinstall
 usr/lib/libplp.la
 usr/lib/libplp.so.*
 usr/share/locale/*/LC_MESSAGES/plptools.mo
-usr/share/man
+usr/share/man/man8
+usr/share/man/man1/plp*.1
+usr/share/man/man1/sis*.1
 usr/share/plptools
 etc/plptools.conf
diff --git a/debian/rules b/debian/rules
index 789ceab..d2968a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,17 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
 export DH_COMPAT=3
 
 tmp = $(shell pwd)/debian/tmp
 
+%.1: %.1.in
+	MANDATE=`grep CHECKIN $< | awk '{print $$4}'` ; \
+	sed -e "s%@MANDATE@%$$MANDATE%g" $< > $@
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -24,7 +28,8 @@ configure-stamp:
 	autoconf
 	touch include/stamp-h.in
 	./configure --prefix=/usr --with-mountdir=/var/lib/plptools/mnt \
-		--mandir=/usr/share/man --with-initdir=none --enable-kde
+		--mandir=/usr/share/man --with-initdir=none --enable-kde \
+		--disable-rpath
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -38,20 +43,27 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	# Add here commands to clean up after the build process.
 	-$(MAKE) maintainer-clean
 	dh_clean
 
-install: build
+man-install: debian/kpsion.1 debian/klipsi.1
+	install -m 644 $^ $(tmp)/usr/share/man/man1
+
+install: build debian/kpsion.1 debian/klipsi.1
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	# Add here commands to install the package into debian/tmp.
+	# install into debian/tmp.
 	$(MAKE) DESTDIR=$(tmp) install
-	mkdir -p $(tmp)/etc
+	install -d $(tmp)/etc
 	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
 	# Split into sub-packages
+	cat CHANGES ChangeLog > changelog
 	dh_movefiles -pplptools
 	dh_movefiles -pplptools-dev
 	dh_movefiles -pplptools-kde
@@ -77,7 +89,7 @@ binary-arch: build install
 #	dh_installcron
 	dh_installman -a
 #	dh_installinfo
-#	dh_undocumented
+	dh_undocumented -a
 	dh_installchangelogs 
 	dh_link
 	dh_strip