[armedbear-cvs] r14232 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Wed Nov  7 10:00:29 2012
New Revision: 14232

Log:
Fixes #261:  ABCL-CONTRIB finding logic widened to Debian packaging conventions.

Thanks for Christoph.

Modified:
   trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp	Fri Nov  2 05:48:20 2012	(r14231)
+++ trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp	Wed Nov  7 10:00:29 2012	(r14232)
@@ -10,7 +10,7 @@
                 (equal (pathname-type p) "jar")
                 (java:jstatic "matches"
                               "java.util.regex.Pattern" 
-                              "abcl(-[0-9]\\.[0-9]\\.[0-9](-.+)?)?" 
+                              "abcl(-[0-9]\\.[0-9]\\.[0-9]([+~-].+)?)?" 
                               (pathname-name p))
                 p)))
     (dolist (loader (java:dump-classpath))