[SCM] Debian package checker branch, master, updated. 2.2.1-6-g5d47af0

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 28f44a106263e23bce1df608a816285cc7bbddd9
Author: Russ Allbery <rra@debian.org>
Date:   Sun Feb 1 10:49:07 2009 -0800

    Fix handling of $/, which broke Lintian::Tag::Info
    
    * checks/debconf:
      + [RA] Reset $/ before issuing duplicate-fields-in-templates to
        prevent problems if -i was given.
    * checks/debhelper:
      + [RA] Remove stray localization of $/, which broke -i when issuing
        tags about ${misc:Depends}.

diff --git a/checks/debconf b/checks/debconf
index 6a12574..bd3da3d 100644
--- a/checks/debconf
+++ b/checks/debconf
@@ -184,6 +184,7 @@ if ($seentemplates) {
 
 	foreach (keys %fields) {
 	    if ($fields{$_} > 1) {
+		local $/ = "\n";
 		tag "duplicate-fields-in-templates", "$name $_";
 		#  Templates file is corrupted, no need to report
 		#  further errors
diff --git a/checks/debhelper b/checks/debhelper
index cfa7b27..bb50b68 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -152,7 +152,6 @@ my $single_pkg = keys(%$pkgs) == 1 ? $pkgs->{(keys(%$pkgs))[0]} : '';
 
 for my $binpkg (keys %$pkgs) {
     my ($weak_depends, $strong_depends, $depends) = ('','','');
-    local $/;
 
     foreach my $field (qw(pre-depends depends)) {
 	$strong_depends .= $info->binary_field($binpkg, $field);
diff --git a/debian/changelog b/debian/changelog
index 07af705..5e04988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ lintian (2.2.2) UNRELEASED; urgency=low
     + [ADB] Treat the new copyright file format's "License-Alias: Perl" as
       indicating that the package is licensed under the same terms as Perl.
       Thanks, gregor herrmann.  (Closes: #513831)
+  * checks/debconf:
+    + [RA] Reset $/ before issuing duplicate-fields-in-templates to
+      prevent problems if -i was given.
+  * checks/debhelper:
+    + [RA] Remove stray localization of $/, which broke -i when issuing
+      tags about ${misc:Depends}.
   * checks/scripts:
     + [RA] Add nickle as a known interpreter.  Patch from Julien Cristau.
       (Closes: #513823)

-- 
Debian package checker