Update from current (0.15-2) Debian files.

9 files changed, 239 insertions, 31 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index cc3615b..75d9b09 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,4 +12,5 @@ the file /usr/share/doc/etc/udev-usbserial-plptools.rules
 The Debian version of plpnfsd mounts the EPOC disks under
 /var/lib/plptools/mnt
 
- -- John Lines <john@paladin.demon.co.uk>, Sat Nov 10 13:10:45 GMT 2001
+
+ -- John Lines <john@paladin.demon.co.uk>, Sun Aug 20 06:59:58 BST 2006
diff --git a/debian/changelog b/debian/changelog
index 4da3eb5..7697045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,206 @@
+plptools (0.15-2) unstable; urgency=low
+
+  * Acknowledge NMUs
+  * Add --wildcards switch to tar in plpbackup (closes: #386834, #378208)
+     thanks to Reuben Thomas for the patch.
+  * Stop plpnfsd more gracefully in /etc/init.d/plptools (Closes: #386841)
+  * Fix problem in plptools-kde prerm and postinst (Closes: #347365)
+
+ -- John Lines <john@paladin.demon.co.uk>  Tue, 16 Jan 2007 22:16:08 +0000
+
+plptools (0.15-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload (Utrecht BSP)
+  * Fix FTBFS on amd64 by removing obsolete typedefs
+    thanks to Frits Daalmans for the patch.
+    (closes: #384146, #386833, #388831)
+
+ -- Bas Zoetekouw <bas@debian.org>  Sun,  1 Oct 2006 13:15:26 +0200
+
+plptools (0.15-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload (Utrecht BSP)
+  * Fix FTBFS by chnaging the ENUM_DEFINITION macro; 
+    thanks to Mike O'Connor for the patch.
+    (closes: #384146, #386833, #388831)
+
+ -- Bas Zoetekouw <bas@debian.org>  Fri, 29 Sep 2006 14:38:16 +0000
+
+plptools (0.15-1) unstable; urgency=low
+
+  * New upstream release (Closes: #371044)
+  * Build with --with-serial=/dev/ttyS0 (Closes: #341822)
+  * libplpc2a Replaces plptools <=0.14-4 (Closes: #365031)
+
+ -- John Lines <john@paladin.demon.co.uk>  Sun, 20 Aug 2006 07:22:41 +0100
+
+plptools (0.14-4) unstable; urgency=low
+
+  * Split libplp into its own library package (Closes: #339251)
+  * Suggest portmap for plptools as plpnfsd needs it, but plpftp does not (Closes: #341166)
+  * Add Swedish debconf template (Closes: #351350)
+
+ -- John Lines <john@paladin.demon.co.uk>  Sun,  9 Apr 2006 15:21:24 +0100
+
+plptools (0.14-3) unstable; urgency=low
+
+  * Rebuild C++ ABI transition (Closes: #339251) - note library is internal to plptools suite
+  * Allow dh_installdebconf to set up correct debconf dependancy (Closes: #332069)
+
+ -- John Lines <john@paladin.demon.co.uk>  Tue, 27 Dec 2005 17:34:49 +0000
+
+plptools (0.14-2) unstable; urgency=low
+
+  * Fix build on amd64, patch from Andreas Jochens (Closes: #330034)
+  * Fix typos in debconf question (Closes: #251601)
+  * Mark plptools templates strings as translatable (Closes: #338133)
+  * Incorporate Czech and Vietnamese debconf templates (Closes: #316870,#318434)
+  * Correct some spelling errors in de.po, patch from Jens Seidel (Closes: #313940)
+
+ -- John Lines <john@paladin.demon.co.uk>  Sat, 12 Nov 2005 14:24:48 +0000
+
+plptools (0.14-1) unstable; urgency=low
+
+  * New Upstream release (Closes: #325483,#304950)
+  * Use libreadline5 (Closes: #326308)
+  * Add po-debconf to Build-Depends
+  * Add plptools-kde, kpsion and klipsi back into control file
+  * Correct spelling in plptools-kde control section (Closes: #268538)
+  * New upstream contains fixes to enable gcc 4.0 compile (Closes: #303721) 
+
+ -- John Lines <john@paladin.demon.co.uk>  Sun, 18 Sep 2005 18:33:25 +0100
+
+plptools (0.12-5) unstable; urgency=low
+
+  * Only build plptools and plptools-dev, remove the KDE dependent targets
+     as a workaround to get plptools into testing (Closes: #246475)
+
+ -- John Lines <john@paladin.demon.co.uk>  Sun, 12 Sep 2004 10:41:01 +0100
+
+plptools (0.12-4) unstable; urgency=low
+
+  * Acknowledge bugs fixed in NMUs
+  * Closes: #173345: undeclared dep on kdelibs-dev
+  * Closes: #189113: plptools_0.12-1.1(unstable/sparc): broken build-
+    depends
+  * Closes: #201753: plptools_0.12-1.2(mipsel/unstable): broken build-
+    depends
+  * Closes: #175728: plptools_0.11-1.1(unstable/ia64): FTBFS: versioned
+    dependency on provided package
+  * Closes: #189135: plpbackup doesn't work
+  * Also fix translation bugs.
+  * Closes: #228468: Some strings shouldn't be marked for translation
+
+ -- John Lines <john@paladin.demon.co.uk>  Mon, 26 Jan 2004 22:19:17 +0000
+
+plptools (0.12-3) unstable; urgency=low
+
+  * Closes: #207100 fix libnewt dependencies. 
+
+ -- John Lines <john@paladin.demon.co.uk>  Sun, 11 Jan 2004 12:28:27 +0000
+
+plptools (0.12-2) unstable; urgency=low
+
+  * Closes: #217900: FTBFS on ia64 - conflicting type declarations
+  * Closes: #221004: config.sub/config.guess out of date
+      libtoolize -c --force to regenerate these files
+  * Closes: #191986: prerm script breaks if system has two kdebugrc
+    files
+  * Closes: #200062: Upgrade problems
+  * Closes: #208869: Please switch to gettext-based debconf templates
+  * Closes: #211268: French translation of gettext debconf template
+
+ -- John Lines <john@paladin.demon.co.uk>  Tue, 16 Dec 2003 12:00:40 +0000
+
+plptools (0.12-1.3) unstable; urgency=low
+
+  * NMU (again) to DELAYED/7-day:
+    - Build-Depends is now _really_ fixed by removing the or
+      dependancies, as should have done previously (Closes: #201753)
+    - Recompiled with libnewt0.51 (Closes: #207100)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 18 Sep 2003 02:11:51 +0200
+
+plptools (0.12-1.2) unstable; urgency=low
+
+  * NMU upload (again) since Jon does not answer emails:
+  (I cannot access the CVS server of plptools at sourceforge since it
+   is down for maintenance so I don't know if this has been fixed
+   upstream)
+    - Fixed the Build-Depends and used --with-qt-dir=/usr/share/qt3 
+      in debian/rules as suggested by KDE developer Ralf Nolden 
+      (Closes: #189113)
+    - Added the patch which fixes plbackup's unfriendly behavior of not
+      printing an error if called with no arguments (Closes: #189135)
+    - Added <cassert> to Enum in order for it to compile with g++ 3.3
+    (the includes should be cleaned too since they use deprecated calls,
+    upstream should do this -if not done already in CVS)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri, 20 Jun 2003 19:01:52 +0200
+
+plptools (0.12-1.1) unstable; urgency=high
+
+  * NMU upload since the maintainer cannot upload it himself.
+  (after much struggling trying to get kdebase4 into my environment)
+    - added John's Build-Depends for 0.12 (uses automake1.7)
+    - Improved Build-Depends to avoid using versioning depends on
+    automake use automake1.X instead (Closes: #175728)
+    - added 0.11 changelog entries.
+    - included 'fake' 0.12-1 entry
+    - removes kde-config from plptools-dev (Closes: #173345)
+    - Added the Homepage to all packages 
+    - Added libqte-mt3-dev to Build-Depend, after a lot of issues 
+    trying to make it compile in unstable
+    (kdelibs4-dev pulls in libqte-mt3-dev and that one conflicts
+    with libqt3-dev)
+    - Modified m4 macros for QT detection and regerenated 
+    aclocal.m4 to look for libqt properly and use -lqt-mt in Debian!
+    (ugly hack which works with libqte-mt-dev)
+    - Changed maintainer-clean to distclean in debian/rules (why
+      was maintainer-clean done?)
+    - Fixed psitime.cc use of Psitime::Psitime
+    - Note: Be careful when compiling this package using libqte-mt-dev
+    and make sure that /usr/bin/moc points to /usr/bin/moc-qt3 and not
+    /usr/bin/moc-qt2 (otherwise it will _not_ compile)
+    - Debian/rules no longer moves files which should be kept on debian/
+    (still, I don't like the find done after the previous 'mv')
+  * Based on new upstream version  which fixes a local root vulnerability
+    (Closes: #178981)
+  (Note to John: there were no .tar.gz or .diff.gz for the 0.12 version
+  at http://www.paladin.demon.co.uk/packages/ so I had to take them
+  from sourceforge and shake & mix with version in unstable and your .changes)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri, 11 Apr 2003 12:35:46 +0200
+
+plptools (0.12-1) unstable; urgency=low
+  
+  * Build from CVS version to incorporate gcc3.2 changes
+
+ -- John Lines <john@paladin.demon.co.uk>  Thu, 13 Feb 2003 22:12:59 +0000
+
 plptools (0.12-0) unstable; urgency=low
 
   * Security fix for several formatstring exploits
 
  -- Fritz Elfert <felfert@users.sf.net>  Mon,  3 Feb 2003 06:01:22 +0100
 
+plptools (0.11-1.1) unstable; urgency=high
+
+  * Non-maintainer upload
+  * This is due to John Lines' problems with his pgp key.
+
+ -- Hugo Espuny <hec@debian.org>  Fri, 15 Nov 2002 14:06:30 +0100
+
+plptools (0.11-1) unstable; urgency=low
+
+  * Official package, based on Fritz's packaging.
+  * contains LaMont Jones' patch for gcc3 build - Closes: #104967
+  * plpbackup now has a restore function - Closes: #149615
+  * Contains fixes for cpu eating problems - Closes: #119948, #146702
+
+ -- John Lines <john@paladin.demon.co.uk>  Thu, 25 Jul 2002 21:46:15 +0100
+
+
 plptools (0.11-0) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index b1b6f2d..1e087c6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: plptools
-Build-Depends: debhelper (>= 4.0.2), automake (>= 1:1.4-p4-1.1) | automake1.6, autoconf, libtool, gettext, libncurses5-dev, libreadline5-dev, libnewt-dev, kdoc
+Build-Depends: debhelper (>= 5), automake1.7, autoconf, libtool, gettext, libncurses5-dev, libreadline5-dev, libnewt-dev, kdoc, po-debconf
 Section: otherosfs
 Priority: optional
 Maintainer: John Lines <john@paladin.demon.co.uk>
-Standards-Version: 3.5.6.1
+Standards-Version: 3.6.2.0
 
 Package: plptools
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.0)
+Depends: ${shlibs:Depends},${misc:Depends}
+Suggests: portmap
 Description: Access a Psion PDA over a serial link 
  This package lets you access EPOC devices' drives over a serial link.
  You can mount them NFS-style, access them FTP-style, and use a local 
@@ -15,10 +16,19 @@ Description: Access a Psion PDA over a serial link
  .
  Homepage: http://plptools.sourceforge.net/
 
+Package: libplpc2a
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},${misc:Depends}
+Replaces: plptools (<=0.14-4)
+Description: Library functions for plptools EPOC PDA access functions
+ This library provides the internal APIs used by the plptools programs
+ which are used to access a EPOC PDA from a Unix system
+
 Package: plptools-dev
 Architecture: any
 Section: devel
-Depends: plptools (= ${Source-Version})
+Depends: libplpc2a (= ${Source-Version})
 Description: plptools (development files)
  This package provides a static library, headers and API documentation
  for plptools development. You need these files if you want to build
diff --git a/debian/copyright b/debian/copyright
index 3fc7ca2..7b09590 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,11 @@
 This package was debianized by John Lines <john@paladin.demon.co.uk> on
 Wed, 13 Dec 2000 11:35:52 +0000.
 
-It was downloaded from plptools.sourceforge.net via CVS
+It was downloaded from plptools.sourceforge.net version 0.19.tar.gz and
+repackaged with ??? to remove the upstream debian directory.
 
-Upstream Author(s): Fritz Elfert
+Upstream Author(s): Fritz Elfert, Philip Proudman, Rudolf Koenig,
+Matt Gumbley, Reuben Thomas
 
 Copyright:
 
@@ -19,7 +21,7 @@ Copyright:
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place Suite 330, Boston, MA 02111-1307 USA.
+  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/libplpc2a.files b/debian/libplpc2a.files
new file mode 100644
index 0000000..3a9a529
--- /dev/null
+++ b/debian/libplpc2a.files
@@ -0,0 +1,2 @@
+usr/lib/libplp.la
+usr/lib/libplp.so.*
diff --git a/debian/plptools.files b/debian/plptools.files
index 1b2ae48..0afadb0 100644
--- a/debian/plptools.files
+++ b/debian/plptools.files
@@ -1,8 +1,6 @@
 usr/sbin/*
 usr/bin/plpftp
 usr/bin/sisinstall
-usr/lib/libplp.la
-usr/lib/libplp.so.*
 usr/share/locale/*/LC_MESSAGES/plptools.mo
 usr/share/man/man8
 usr/share/man/man1/plp*.1
diff --git a/debian/plptools.menu b/debian/plptools.menu
index a3f1427..8720058 100644
--- a/debian/plptools.menu
+++ b/debian/plptools.menu
@@ -1,2 +1,2 @@
-?package(plptools):needs=text section=Apps/Tools\
+?package(plptools):needs="text" section="Apps/Tools"\
   title="plpftp" command="/usr/bin/plpftp"
diff --git a/debian/plptools.templates b/debian/plptools.templates
index dfa0b7f..285aab7 100644
--- a/debian/plptools.templates
+++ b/debian/plptools.templates
@@ -1,6 +1,6 @@
 Template: plptools/customize
 Type: note
-Description: Customize /etc/plptools.conf
+_Description: Customize /etc/plptools.conf
  In addition to plptools' main daemon "ncpd", plptools provides two optional
  daemons:
  .
@@ -13,7 +13,7 @@ Description: Customize /etc/plptools.conf
 Template: plptools/ncpd/start
 Type: boolean
 Default: true
-Description: Should ncpd being started during boot?
+_Description: Should ncpd be started during boot?
  Normally, ncpd - the daemon which handles the serial connection to a
  Psion - is started on boot-up. If you intend to connect your Psion to
  another machine on the net and NEVER will use it locally, you can
@@ -22,14 +22,14 @@ Description: Should ncpd being started during boot?
 Template: plptools/ncpd/serial
 Type: string
 Default: /dev/ttyS0
-Description: Specify serial line to be used
+_Description: Specify serial line to be used
  By default, the Psion is expected to be connected to the first serial
  line (COM1:) of your machine. You can change this here.
 
 Template: plptools/ncpd/listenat
 Type: string
 Default: 127.0.0.1
-Description: Specify the IP address and port for ncpd
+_Description: Specify the IP address and port for ncpd
  If you intend to use the plptools front-ends from other machines, you
  can specify 0.0.0.0 or the IP address of your machine here. Normal
  users should keep the default 127.0.0.1!
@@ -41,7 +41,7 @@ Description: Specify the IP address and port for ncpd
 Template: plptools/plpnfsd/start
 Type: boolean
 Default: false
-Description: Should plpnfsd being started during boot?
+_Description: Should plpnfsd be started during boot?
  If plpnfsd is started during boot-up, it will wait for a Psion being
  connected and then automatically mount that Psion. Since this is
  done as root, non-privileged users will not have access to the
@@ -51,7 +51,7 @@ Description: Should plpnfsd being started during boot?
 Template: plptools/plpnfsd/suid
 Type: boolean
 Default: false
-Description: Set SUID-root bit of plpnfsd?
+_Description: Set SUID-root bit of plpnfsd?
  For convenience on a single-user machine, plpnfsd can be installed with
  the setuid bit enabled. This allows any local user to mount and unmount
  a connected Psion. Be warned, that THIS IS A SECURITY THREAT to your
@@ -60,7 +60,7 @@ Description: Set SUID-root bit of plpnfsd?
 Template: plptools/plpprintd/start
 Type: boolean
 Default: false
-Description: Should plpprintd being started during boot?
+_Description: Should plpprintd be started during boot?
  If you intend to use the Psion's "Print via PC" feature, you can
  enable this option. You must have a working print queue which
  is capable of printing Postscript in order to use this feature.
@@ -68,13 +68,13 @@ Description: Should plpprintd being started during boot?
 Template: plptools/plpprintd/printqueue
 Type: string
 Default: psion
-Description: Specify the print queue to be used
+_Description: Specify the print queue to be used
  Please enter the name of the print queue you want to use for
  printing from the Psion.
 
 Template: plptools/frontends/remoteaddr
 Type: string
-Description: Specify remote host to be contacted
+_Description: Specify remote host to be contacted
  Since you have ncpd either disabled or listening on a non-standard
- address, you should specify the address for the frontents again.
+ address, you should specify the address for the frontends again.
 
diff --git a/debian/rules b/debian/rules
index f32273e..9f6e2de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=5
 
 # Set config options
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -30,7 +30,9 @@ configure-stamp:
 	dh_testdir
 	./configure $(confflags) --prefix=/usr \
 		--with-mountdir=/var/lib/plptools/mnt \
-		--mandir=/usr/share/man --with-initdir=none --disable-rpath
+		--mandir=/usr/share/man --with-initdir=none \
+		--with-serial=/dev/ttyS0 \
+		--disable-rpath
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -44,13 +46,10 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) maintainer-clean
+	-$(MAKE) distclean
 	dh_clean
 
-man-install: debian/kpsion.1 debian/klipsi.1
-	install -m 644 $^ $(tmp)/usr/share/man/man1
-
-install: build debian/kpsion.1 debian/klipsi.1
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -59,18 +58,17 @@ install: build debian/kpsion.1 debian/klipsi.1
 	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` ; \
+		cp -a $$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
 	dh_movefiles -pplptools
+	dh_movefiles -plibplpc2a
 	dh_movefiles -pplptools-dev
 
 # Build architecture-independent files here.