[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.18-52-g4f00bc2



The following commit has been merged in the master branch:
commit 4f00bc2d7e714cb1db4b9e488be8687ff02cf753
Author: Russ Allbery <rra@debian.org>
Date:   Thu Dec 24 15:43:26 2009 -0800

    Suppress changelog-entry-without-new-date for UNRELEASED
    
    * checks/changelog-file:
      + [RA] Suppress latest-debian-changelog-entry-without-new-date if the
        distribution is UNRELEASED.  Thanks, Raphaël Hertzog.
        (Closes: #560149)

diff --git a/checks/changelog-file b/checks/changelog-file
index cf2ac4d..9c4defd 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -281,7 +281,8 @@ if (@entries) {
 
 	if ($first_timestamp && $second_timestamp) {
 	    tag "latest-debian-changelog-entry-without-new-date"
-		unless (($first_timestamp - $second_timestamp) > 0);
+		unless (($first_timestamp - $second_timestamp) > 0
+		        or lc($entries[0]->Distribution) eq 'unreleased');
 	}
 
 	my $first_version = $entries[0]->Version;
diff --git a/debian/changelog b/debian/changelog
index fab733d..61e0594 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ lintian (2.3.0) UNRELEASED; urgency=low
     + [ADB] Exempt all binary packages built from the zlib source from
       the embedded-zlib test, not just those with binary package names
       matching zlib.+.  Thanks, Mark Brown.
+  * checks/changelog-file:
+    + [RA] Suppress latest-debian-changelog-entry-without-new-date if the
+      distribution is UNRELEASED.  Thanks, Raphaël Hertzog.
+      (Closes: #560149)
   * checks/control-file{,.desc}:
     + [RA] Check for < and > version dependencies in debian/control since
       dpkg-source helpfully rewrites and fixes them in binary packages.
diff --git a/t/tests/changelog-file-unreleased/debian/debian/changelog.in b/t/tests/changelog-file-unreleased/debian/debian/changelog.in
new file mode 100644
index 0000000..4c74262
--- /dev/null
+++ b/t/tests/changelog-file-unreleased/debian/debian/changelog.in
@@ -0,0 +1,13 @@
+{$srcpkg} ({$version}) UNRELEASED; urgency=low
+
+  * Lintian Test Suite.
+  * Test: {$testname}
+
+ -- {$author}  {$date}
+
+{$srcpkg} (1.0) unstable; urgency=low
+
+  * An older changelog entry to test suppression of errors about the
+    changelog entry having the same date as the previous one.
+
+ -- {$author}  {$date}
diff --git a/t/tests/changelog-file-unreleased/desc b/t/tests/changelog-file-unreleased/desc
new file mode 100644
index 0000000..4121c7a
--- /dev/null
+++ b/t/tests/changelog-file-unreleased/desc
@@ -0,0 +1,6 @@
+Testname: changelog-file-unreleased
+Sequence: 6000
+Version: 2.0
+Description: Supress new date warnings for UNRELEASED
+Test-Against: latest-debian-changelog-entry-without-new-date
+References: Debian Bug#560149
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/changelog-file-unreleased/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/changelog-file-unreleased/tags

-- 
Debian package checker


Reply to: