[SCM] Debian package checker branch, master, updated. 2.5.0-rc3-36-ge8e3278

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 3269db801ea4e0c289ddb9effecd747efbfb9a2c
Author: Antonio Terceiro <terceiro@softwarelivre.org>
Date:   Mon May 9 12:43:44 2011 -0700

    Update Ruby scripts for new Ruby policy

diff --git a/checks/scripts b/checks/scripts
index e512031..2a49c86 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -95,7 +95,7 @@ our %interpreters =
      rep            => [ '/usr/bin' ],
      rexx	    => [ '/usr/bin', 'regina-rexx' ],
      rrdcgi	    => [ '/usr/bin', 'rrdtool' ],
-     ruby	    => [ '/usr/bin' ],
+     ruby	    => [ '/usr/bin', 'ruby | ruby-interpreter' ],
      runhaskell     => [ '/usr/bin', 'ghc | ghc6' ],
      runhugs	    => [ '/usr/bin', 'hugs | hugs98' ],
      sed	    => [ '/bin', '' ],
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 19c8ec9..7e9d955 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -266,14 +266,18 @@ Info: Packages with Python scripts should depend on the package
 Tag: ruby-script-but-no-ruby-dep
 Severity: important
 Certainty: certain
-Info: Packages with Ruby scripts must depend on the package ruby. Those
- that have Ruby scripts that run under a specific version of Ruby need a
+Info: Packages with Ruby scripts must depend on a valid Ruby interpreter.
+ Those that have Ruby scripts that run under a specific version of Ruby need a
  dependency on the equivalent version of Ruby.
  .
- For example, if a script in the package uses <tt>#!/usr/bin/ruby</tt>,
- the package needs a dependency on "ruby".  If a script uses
- <tt>#!/usr/bin/ruby1.9</tt>, then the package need a dependency on
- "ruby1.9".
+ If a script in the package uses <tt>#!/usr/bin/ruby</tt>, the package needs a
+ dependency on "ruby | ruby-interpreter". This allows users to choose which
+ interpreter to use by default. If the package is intended to be used with a
+ specific Ruby version, its scripts should use that version directly, such
+ as <tt>#!/usr/bin/ruby1.8</tt>
+ .
+ If a script uses <tt>#!/usr/bin/ruby1.9</tt>, then the package needs a
+ dependency on "ruby1.9".
  .
  In some cases a weaker relationship, such as Suggests or Recommends, will
  be more appropriate.
diff --git a/debian/changelog b/debian/changelog
index f4e5e93..6e21628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,10 @@ lintian (2.5.0~rc4) UNRELEASED; urgency=low
       contain at least one jar file we check.  This fixes false-positives
       for packages that depended on libX-java-doc packages or packages
       that only contain jar files we ignore.
+  * check/scripts{,.desc}:
+    + [NT] Accepted patch from Antonio Terceiro to allow ruby-interpreter
+      as alternative to ruby for /usr/bin/ruby scripts.
+      (Closes: #626210)
 
   * lib/Lintian/ProcessableGroup.pm:
     + [NT] Properly handle if the changes file is located directly in the

-- 
Debian package checker