From: Bdale Garbee <bdale@gag.com>
Date: Tue, 4 Aug 2009 19:33:11 +0000 (-0600)
Subject: Merge commit 'cworth/master' into dfsg-debian
X-Git-Url: https://git.cworth.org/git?p=tar;a=commitdiff_plain;h=4a9bda2af00e83f7eb4f66606b69f38c78a8e65c;hp=f63937ee1182081ec42ac8bfc419666a6b9a0edd

Merge commit 'cworth/master' into dfsg-debian
---

diff --git a/debian/changelog b/debian/changelog
index 50c8d98..ef85817 100644
--- 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 0ea1746..d946951 100644
--- 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 6a369a4..54246ae 100755
--- 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 74df4ff..3ef257d 100644
--- 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.