Merge commit 'cworth/master' into dfsg-debian

diff --git a/debian/changelog b/debian/changelog
index 50c8d98310f44dc27cfbf8f893cef4db5d70a24e..ef85817764ae311ef9f8dcfdd3f7d9595ffb1b9f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 tar (1.22-2) UNRELEASED; urgency=low
 
   * Add Carl Worth as an uploader.
-  * Fix to allow parallel build (-j2), closes #535319
-  * Don't close file stream before EOF, closes #525818
-  * Preserve hard links with --remove-files, closes #188663
+  * Fix to allow parallel build (-j2), closes: #535319
+  * Don't close file stream before EOF, closes: #525818
+  * Preserve hard links with --remove-files, closes: #188663
     Thanks to Ted T'so for the idea and Sergey Poznyakoff for
     cleaning up my original implementation.
+  * Respect DEB_BUILD_OPTIONS=nocheck to conform with Policy 3.8.2
 
- -- Carl Worth <cworth@cworth.org>  Wed, 29 Jul 2009 16:18:18 -0700
+ -- Carl Worth <cworth@cworth.org>  Tue, 04 Aug 2009 12:07:06 -0700
 
 tar (1.22-1.1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 0ea1746c4bd8d88de08c98a12a3f450f8b9be44a..d9469510dd65f7f1f60c04de6e23be0cfc762dd3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: required
 Maintainer: Bdale Garbee <bdale@gag.com>
 Uploaders: Carl Worth <cworth@cworth.org>
 Build-Depends: debhelper (>> 5), gettext, autoconf, autotools-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: tar
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 6a369a4127c82ee60828e205cd5f618795ee26b1..54246aecdd2afdbe506079dd2f76cae1a49d8951 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,11 @@ build-stamp: configure-stamp
        dh_testdir
        RSH="/usr/bin/rsh" CFLAGS="-O2 -g -Wall -fno-gnu89-inline" $(MAKE)
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
        (cd tests ; $(MAKE) clean)
        $(MAKE) check
+endif
 endif
 
        perl debian/tarman > debian/tar.1

diff --git a/debian/tarman b/debian/tarman
index 74df4ff55c425f10f693f29688314c00e79f8744..3ef257dc5a915c657d2eb739e8a88e6c50eebc5b 100644 (file)
--- a/debian/tarman
+++ b/debian/tarman
@@ -275,7 +275,7 @@ $command_string
 stores and extracts files from a tape or disk archive.
 .Pp
 The first argument to
-.B tar
+tar
 should be a function; either one of the letters
 .Cm $short_letters ,
 or one of the long function names.