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

[SCM] Debian package checker branch, master, updated. 2.3.3-12-g44e66db



The following commit has been merged in the master branch:
commit 44e66dbe478349ba406aa3d8f0c2f8c3e7492ec1
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Mar 20 14:27:46 2010 -0600

    Don't warn about timewarp-s-v but an UNRELEASED changelog
    
    * checks/standards-version:
      + [RG] Don't warn about timewarp-standards-version when the
        changelog's distribution is "UNRELEASED."  Thanks, Raphaël Hertzog.
        (Closes: #571616)

diff --git a/checks/standards-version b/checks/standards-version
index 96c46fe..039549a 100644
--- a/checks/standards-version
+++ b/checks/standards-version
@@ -77,17 +77,20 @@ my ($major, $minor, $patch) = $stdver =~ m/^(\d+)\.(\d+)\.(\d+)/;
 # file.  If we can't find the changelog file, assume that the package was
 # released today, since that activates the most tags.
 my $changes = $info->changelog;
-my $pkgdate;
+my ($pkgdate, $dist);
 if (defined $changes) {
     my ($entry) = $changes->data;
     $pkgdate = ($entry && $entry->Timestamp) ? $entry->Timestamp : time;
+    $dist = ($entry && $entry->Distribution)? $entry->Distribution : '';
 } else {
     $pkgdate = time;
 }
 
 # Check for packages dated prior to the date of release of the standards
 # version with which they claim to comply.
-if ($STANDARDS->known($stdver) && $STANDARDS->value($stdver) > $pkgdate) {
+if ($dist ne 'UNRELEASED' && $STANDARDS->known($stdver)
+    && $STANDARDS->value($stdver) > $pkgdate) {
+
     my $package = strftime('%Y-%m-%d', gmtime $pkgdate);
     my $release = strftime('%Y-%m-%d', gmtime $STANDARDS->value($stdver));
     tag 'timewarp-standards-version', "($package < $release)";
diff --git a/debian/changelog b/debian/changelog
index 7e91345..59179f6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ lintian (2.3.4) UNRELEASED; urgency=low
     + [ADB] Update the list of octave interpreters, adding octave3.2
       (Closes: #574048) and removing octave2.1 (only available in lenny
       and earlier) and octave3.1.
+  * checks/standards-version:
+    + [RG] Don't warn about timewarp-standards-version when the
+      changelog's distribution is "UNRELEASED."  Thanks, Raphaël Hertzog.
+      (Closes: #571616)
 
   * debian/control:
     + [RG] Update package description to mention Policy version 3.8.4
diff --git a/t/tests/standards-version-timewarp/debian/debian/changelog.in b/t/tests/standards-version-timewarp-unreleased/debian/debian/changelog.in
similarity index 77%
copy from t/tests/standards-version-timewarp/debian/debian/changelog.in
copy to t/tests/standards-version-timewarp-unreleased/debian/debian/changelog.in
index 6fc94c5..57fa089 100644
--- a/t/tests/standards-version-timewarp/debian/debian/changelog.in
+++ b/t/tests/standards-version-timewarp-unreleased/debian/debian/changelog.in
@@ -1,4 +1,4 @@
-{$srcpkg} ({$version}) unstable; urgency=low
+{$srcpkg} ({$version}) UNRELEASED; urgency=low
 
   * Lintian Test Suite.
   * Test: {$testname}
diff --git a/t/tests/standards-version-timewarp-unreleased/desc b/t/tests/standards-version-timewarp-unreleased/desc
new file mode 100644
index 0000000..d939cfc
--- /dev/null
+++ b/t/tests/standards-version-timewarp-unreleased/desc
@@ -0,0 +1,5 @@
+Testname: standards-version-timewarp-unreleased
+Sequence: 6000
+Version: 1.0
+Description: Test newer standards version with unreleased old changelog date
+Test-Against: timewarp-standards-version
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/standards-version-timewarp-unreleased/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/standards-version-timewarp-unreleased/tags

-- 
Debian package checker


Reply to: