From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Nov 2010 23:22:17 +0000 (-0700)
Subject: cleanups before upload
X-Git-Tag: debian/1.25-1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bcf1f3bf6a60a232a701cb4db1aa82290c6cd6db;p=debian%2Ftar

cleanups before upload
---

diff --git a/debian/changelog b/debian/changelog
index 758ceda2..28792cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 tar (1.25-1) unstable; urgency=low
 
-  * new upstream version, closes: #602184, #602209, #602413
+  * new upstream version, closes: #602184, #602209, #602413, #575298
   * Add Vcs-Git, Vcs-Browser fields to debian/control using patch from
     Simon McVittie's 1.24-1.1 NMU, closes: #602639, #602709
+  * stop patching src/list.c since it now does more harm than good,
+    and add a Breaks against old dpkg versions, closes: #522858
 
  -- Bdale Garbee <bdale@gag.com>  Wed, 10 Nov 2010 15:45:09 -0700
 
diff --git a/debian/control b/debian/control
index 65a3f13e..acd3fac5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
 Essential: yes
 Conflicts: cpio (<= 2.4.2-38)
 Replaces: cpio (<< 2.4.2-39)
+Breaks: dpkg-dev (<< 1.14.26)
 Suggests: bzip2, ncompress, xz-utils
 Description: GNU version of the tar archiving utility
  Tar is a program for packaging a set of files as a single archive in tar
diff --git a/src/list.c b/src/list.c
index 68f51150..a70f0d38 100644
--- a/src/list.c
+++ b/src/list.c
@@ -218,17 +218,9 @@ read_and (void (*do_something) (void))
 	                            read_header_auto);
 	      if (status == HEADER_ZERO_BLOCK)
 		break;
-	      /* 
-	       * According to POSIX tar specs, this is wrong, but on the web
-	       * there are some tar specs that can trigger this, and some tar
-	       * implementations create tars according to that spec.  For now,
-	       * let's not be pedantic about issuing the warning.
-	       */
-#if 0	       
 	      WARNOPT (WARN_ALONE_ZERO_BLOCK,
 		       (0, 0, _("A lone zero block at %s"),
 			STRINGIFY_BIGINT (current_block_ordinal (), buf)));
-#endif
 	      break;
 	    }
 	  status = prev_status;