Merge branch 'upstream'

Conflicts:
	pax.1

diff --cc debian/changelog
index 6b578b6f7466bd8d2a81f77dd997721c8183b86e,0000000000000000000000000000000000000000..3f809fe0d8cec70f2e44903f6130c89b6dc15b98
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,123 -1,0 +1,123 @@@
- pax (1:20080811-1) UNRELEASED; urgency=low
++pax (1:20090728-1) UNRELEASED; urgency=low
 +
 +  * new upstream version synthesized from OpenBSD CVS HEAD, 
 +    closes: #434470, #277738
 +
 + -- Bdale Garbee <bdale@gag.com>  Mon, 11 Aug 2008 17:58:52 -0300
 +
 +pax (1:1.5-16) unstable; urgency=low
 +
 +  * patch for -s irregularities from Stephane Chazelas, closes: #451361
 +  * clean up various lintian warnings
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue, 11 Dec 2007 23:13:03 -0700
 +
 +pax (1:1.5-15) unstable; urgency=low
 +
 +  * update priority in control file to match override
 +  * patch to fix archiving of 100 byte pathnames, closes: #191127
 +  * patch to fix full prefix field in ustar format, closes: #201768
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 30 May 2004 00:48:29 -0300
 +
 +pax (1:1.5-14) unstable; urgency=low
 +
 +  * merge bzip2 support patch from Stephen Williams, closes: #178995
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue, 18 Feb 2003 01:20:50 -0700
 +
 +pax (1:1.5-13) unstable; urgency=low
 +
 +  * apply patch from Anthony Towns to fix minor POSIX incompliance observed
 +    during LSB certification work, closes: #139943
 +
 + -- Bdale Garbee <bdale@gag.com>  Thu, 15 Aug 2002 14:56:57 -0600
 +
 +pax (1:1.5-12) unstable; urgency=low
 +
 +  * apply patch from Adam Heath for off-by-one error in tar.c when a file 
 +    has a long name, and the prefix is being filled for a posix tar header.  
 +    The last byte in the prefix wasn't being set to \0, closes: #128980
 +  * minor cosmetic changes to debian/ files
 +
 + -- Bdale Garbee <bdale@gag.com>  Mon, 14 Jan 2002 13:58:46 -0700
 +
 +pax (1:1.5-11) unstable; urgency=low
 +
 +  * change man page to fix references to POSIX standard, closes: #97839
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue,  1 Jan 2002 09:43:00 -0700
 +
 +pax (1:1.5-10) unstable; urgency=low
 +
 +  * undo #if DEBIAN clause in file_subs.c that forced used of chown instead
 +    of lchown, since it's not necessary with modern kernels and causes other
 +    problems, closes: #110253
 +  * get rid of suidregister stuff, update standards version, etc
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 30 Dec 2001 20:42:33 -0700
 +
 +pax (1:1.5-9) unstable; urgency=low
 +
 +  * trim extended description since paxutils is still not out, closes: #79035
 +  * fix sys/time.h + time.h inclusion problems, closes: #100790, #105191
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 22 Jul 2001 23:20:46 -0600
 +
 +pax (1:1.5-8) stable unstable; urgency=low
 +
 +  * oops.  rebuild with appropriate libraries for potato, closes: #75012
 +
 + -- Bdale Garbee <bdale@gag.com>  Fri, 20 Oct 2000 12:16:17 -0600
 +
 +pax (1:1.5-7) stable unstable; urgency=low
 +
 +  * apply patch from Geoff Clare <geoff@gclare.org.uk> that fixes problem with
 +    "full" name fields in ustar format.  Target stable since this can cause
 +    file loss under some circumstances.  Closes: #71644
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 15 Oct 2000 23:25:49 -0600
 +
 +pax (1:1.5-6) unstable; urgency=low
 +
 +  * update to latest standards, add Build-Depends, get FHS'ed
 +
 + -- Bdale Garbee <bdale@gag.com>  Fri,  7 Jan 2000 20:39:46 -0700
 +
 +pax (1:1.5-5) unstable; urgency=low
 +
 +  * patches from Roman Hodek to include <sys/sysmacros.h> for glibc2.1,
 +    closes 41656.
 +
 + -- Bdale Garbee <bdale@gag.com>  Mon,  2 Aug 1999 01:51:03 -0600
 +
 +pax (1:1.5-4) unstable; urgency=low
 +
 +  * hack to fix compile problems with glibc-2.1, closes 34668
 +
 + -- Bdale Garbee <bdale@gag.com>  Mon, 24 May 1999 23:45:16 -0600
 +
 +pax (1:1.5-3) unstable; urgency=low
 +
 +  * new maintainer
 +  * freshen to pick up changes in latest OpenBSD pax source, and to get back
 +    to an upstream orig and Debian diffs configuration
 +  * rewrite rules file to use debhelper
 +  * update long description to indicate that this package will eventually
 +    be obsoleted by paxutils, a pre-release of which I'm working with now
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed,  2 Dec 1998 21:21:57 -0700
 +
 +pax (1:1.5-2) unstable; urgency=low
 +
 +  * changed Maintainer address to official and working Debian address
 +
 +  * renamed md5sum to md5sums.
 +
 + -- David Frey <dfrey@debian.org>  Fri, 13 Feb 1998 23:15:39 +0100
 +
 +pax (1:1.5-1) unstable; urgency=low
 +
 +  * Initial Release of the OpenBSD's pax program from Keith Muller
 +
 + -- David Frey <dFrey@debian.org>  Wed, 10 Dec 1997 12:57:48 +0100

diff --cc pax.1
index 54624199a01ed62be1790204f785b8f534a466f7,63b7eb63b2f66ecf7370fd321649804895c729bc..8b076ecc9d4bf07aa0b57abf43dcc2cd82e59488
--- 1/pax.1
--- 2/pax.1
+++ b/pax.1
@@@ -1143,7 -1143,7 +1143,7 @@@ completes it will exit with a non-zero 
  The
  .Nm
  utility is compliant with the
- POSIX 1003.1-2004
 -.St -p1003.1-2008
++POSIX 1003.1-2008
  specification.
  .Pp
  The flags