- Misc. debian related fixes

5 files changed, 33 insertions, 14 deletions

diff --git a/debian/plptools.conf b/debian/plptools.conf
index 5b090a3..53dbacb 100644
--- a/debian/plptools.conf
+++ b/debian/plptools.conf
@@ -1,5 +1,23 @@
-NCPD_ARGS=
-START_PLPNFSD=yes
-PLPNFSD_ARGS=
+#
+# Add any arguments for ncpd here. See ncpd(8) for info about possible
+# arguments.
+#
+NCPD_ARGS=""
+#
+# Set this to yes, if you want to start plpnfsd during boot.
+#
+START_PLPNFSD=no
+#
+# Add any arguments for plpnfsd here. See plpnfsd(8) for info about possible
+# arguments.
+#
+PLPNFSD_ARGS=""
+#
+# Set this to yes, if you want to start plpprintd during boot.
+#
 START_PLPPRINTD=no
-PLPPRINTD_ARGS=
+#
+# Add any arguments for plpprintd here. See plpprintd(8) for info about possible
+# arguments. Note: You also need to set up a printer for this to work.
+#
+PLPPRINTD_ARGS=""
diff --git a/debian/plptools.conffiles b/debian/plptools.conffiles
index 05275a7..f3d46d9 100644
--- a/debian/plptools.conffiles
+++ b/debian/plptools.conffiles
@@ -1 +1 @@
-/etc/psion.conf
+etc/plptools.conf
diff --git a/debian/plptools.files b/debian/plptools.files
index 8962d70..121f2ee 100644
--- a/debian/plptools.files
+++ b/debian/plptools.files
@@ -7,3 +7,4 @@ usr/lib/libplp.so.*
 usr/share/locale/*/LC_MESSAGES/plptools.mo
 usr/share/man
 usr/share/plptools
+etc/plptools.conf
diff --git a/debian/plptools.manpages b/debian/plptools.manpages
deleted file mode 100644
index 157c02e..0000000
--- a/debian/plptools.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/man/man1/plpbackup.1
-usr/share/man/man1/plpftp.1
-usr/share/man/man1/sisinstall.1
-usr/share/man/man8/ncpd.8
-usr/share/man/man8/plpnfsd.8
-usr/share/man/man8/plpprintd.8
diff --git a/debian/rules b/debian/rules
index ed8b8b5..144d3da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ configure-stamp:
 	autoconf
 	touch include/stamp-h.in
 	./configure --prefix=/usr --with-mountdir=/var/lib/plptools/mnt \
-		--with-initdir=none --enable-kde
+		--mandir=/usr/share/man --with-initdir=none --enable-kde
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -47,10 +47,16 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	# Add here commands to install the package into debian/tmp.
 	$(MAKE) DESTDIR=$(tmp) install
-
+	mkdir -p $(tmp)/etc
+	install -m 644 debian/plptools.conf $(tmp)/etc
+	# Split into sub-packages
+	dh_movefiles -pplptools
+	dh_movefiles -pplptools-dev
+	dh_movefiles -pplptools-kde
+	dh_movefiles -pkpsion
+	dh_movefiles -pklipsi
 
 # Build architecture-independent files here.
 binary-indep: build install