[SCM] Debian package checker branch, master, updated. 2.2.18-1-g3c5bdd7

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

The following commit has been merged in the master branch:
commit 3c5bdd70740ada503a665e027ce20d64b7ebefb1
Author: Russ Allbery <rra@debian.org>
Date:   Mon Nov 23 02:20:37 2009 -0800

    Allow any RPATH containing $ORIGIN
    
    * checks/binaries:
      + [RA] Allow any RPATH containing $ORIGIN or ${ORIGIN}, not just the
        literal value $ORIGIN.  (Closes: #557511)

diff --git a/checks/binaries b/checks/binaries
index 9acb5c6..e26bafa 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -264,7 +264,7 @@ foreach my $file (sort keys %{$info->file_info}) {
     if (exists $objdump->{RPATH}) {
 	foreach my $rpath (map {File::Spec->canonpath($_)} keys %{$objdump->{RPATH}}) {
 	    next if $rpath =~ m,^/usr/lib/(?:games/)?\Q$pkg\E(?:/|\z),;
-	    next if $rpath =~ m,^\$ORIGIN$,;
+	    next if $rpath =~ m,^\$\{?ORIGIN\}?,;
 	    next if $directories{$rpath} and $rpath !~ m,^(?:/usr)?/lib/?\z,;
 	    tag "binary-or-shlib-defines-rpath", "$file $rpath";
 	}
diff --git a/debian/changelog b/debian/changelog
index 84e528f..8568898 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lintian (2.2.19) UNRELEASED; urgency=low
+
+  * checks/binaries:
+    + [RA] Allow any RPATH containing $ORIGIN or ${ORIGIN}, not just the
+      literal value $ORIGIN.  (Closes: #557511)
+
+ -- Russ Allbery <rra@debian.org>  Mon, 23 Nov 2009 02:20:29 -0800
+
 lintian (2.2.18) unstable; urgency=low
 
   The "synchronize severities with ftpmaster's Lintian checks" release.

-- 
Debian package checker