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

[SCM] Debian package checker branch, master, updated. 2.2.9-25-g7159b61



The following commit has been merged in the master branch:
commit 7159b6148c0e294654a2dd5be6e40d1d39c1ba1b
Author: Russ Allbery <rra@debian.org>
Date:   Mon Apr 27 00:42:31 2009 -0700

    Add jruby1.2 and jruby to valid interpreters
    
    * checks/scripts{,.desc}:
      + [RA] Add jruby1.2 and allow an unversioned jruby reference.  Thanks,
        Sebastien Delafond.  (Closes: #523001)

diff --git a/checks/scripts b/checks/scripts
index e841667..e226854 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -116,10 +116,10 @@ our %interpreters =
 # An interpreter with a version must have a dependency on the specific package
 # formed by taking the fourth element of the list and replacing $1 with the
 # version number.  An interpreter without a version is rejected if the second
-# element is undef; otherwise, the package must depend on the disjunction of
-# the second argument (if non-empty) and all the packages formed by taking the
-# list of known versions (the fifth element and on) and replacing $1 in the
-# fourth argument with them.
+# element is undef; otherwise, the package must satisfy a dependency on the
+# disjunction of the second argument (if non-empty) and all the packages
+# formed by taking the list of known versions (the fifth element and on) and
+# replacing $1 in the fourth argument with them.
 #
 # For example:
 #
@@ -137,8 +137,8 @@ our %versioned_interpreters =
     (guile   => [ '/usr/bin', 'guile',
 		  qr/^guile-([\d.]+)$/, 'guile-$1', qw(1.6 1.8)
 		],
-     jruby   => [ '/usr/bin', undef,
-		  qr/^jruby([\d.]+)$/, 'jruby$1', qw(1.0 1.1)
+     jruby   => [ '/usr/bin', 'jruby',
+		  qr/^jruby([\d.]+)$/, 'jruby$1', qw(1.0 1.1 1.2)
 		],
      lua     => [ '/usr/bin', 'lua',
 		  qr/^lua([\d.]+)$/, 'lua$1', qw(40 50 5.1)
diff --git a/debian/changelog b/debian/changelog
index 5c23d52..d4f52f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ lintian (2.2.10) UNRELEASED; urgency=low
       from Raphael Geissert.  (Closes: #523708)
     + [RA] Clarify the php-script-but-no-phpX-cli-dep description to
       explain why it warns about a php4-cli dependency.  (Closes: #525484)
+    + [RA] Add jruby1.2 and allow an unversioned jruby reference.  Thanks,
+      Sebastien Delafond.  (Closes: #523001)
   * checks/shared-libs:
     + [RA] Strip trailing slashes from the libdir path in *.la files
       before checking it for correctness.  Thanks, Patrick Matthäi.

-- 
Debian package checker


Reply to: