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

[SCM] Debian package checker branch, master, updated. 2.5.1-128-g4df0cf1



The following commit has been merged in the master branch:
commit 4df0cf1259745265e38cfa394d6e302281316e35
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 20 13:35:25 2011 +0200

    Removed exception for symlinked changelogs
    
    The exception for packages with symlinked changelogs and Ubuntu
    versions have been removed, since the profiles does a better job.

diff --git a/checks/changelog-file b/checks/changelog-file
index d55fb30..e2a4346 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -240,10 +240,9 @@ if ($native_pkg) {
 
 # Everything below involves opening and reading the changelog file, so bail
 # with a warning at this point if all we have is a symlink.  Ubuntu permits
-# such symlinks, so give the package a pass if the version number contains
-# ubuntu.
+# such symlinks, so their profile will suppress this tag.
 if (-l 'changelog') {
-    tag 'debian-changelog-file-is-a-symlink' unless $version =~ /ubuntu/;
+    tag 'debian-changelog-file-is-a-symlink';
     return 0;
 }
 
diff --git a/debian/changelog b/debian/changelog
index f1201d2..c7bcd81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ lintian (2.5.2) UNRELEASED; urgency=low
       stripped.  Thanks to Matthias Klose for the report.
       (Closes: #624521)
     + [NT] Do not assume that the architecture field is present.
+  * checks/changelog-file:
+    + [NT] Removed exception for symlinked changelogs if the
+      package had an Ubuntu version.  This exception is now
+      handled by the profile.  Thanks to Benjamin Drung for the
+      heads up.
   * checks/circular-deps.desc:
     + [NT] Fixed typo; thanks to Nicolás Alvarez for the report
       and patch.  (Closes: #630925)

-- 
Debian package checker


Reply to: