r58643 - in /trunk/dh-make-perl: debian/changelog lib/Debian/Dependency.pm

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Sat May 29 14:30:56 2010
New Revision: 58643

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58643
Log:
Debian::Dependency: Recognize deprecated '<' and '>' relations.

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/Debian/Dependency.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=58643&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat May 29 14:30:56 2010
@@ -6,6 +6,7 @@
 
   [ Ansgar Burchardt ]
   * Do not require --cpan in addition to --pkg-perl when adding Vcs-* fields.
+  * Debian::Dependency: Recognize deprecated '<' and '>' relations.
 
  -- Damyan Ivanov <dmn at debian.org>  Wed, 05 May 2010 08:40:51 +0300
 

Modified: trunk/dh-make-perl/lib/Debian/Dependency.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/Dependency.pm?rev=58643&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Dependency.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Dependency.pm Sat May 29 14:30:56 2010
@@ -133,7 +133,11 @@
         delete $self->{ver};
     };
 
-    $self->rel($rel) if $rel;
+    if ($rel) {
+        $rel = '<=' if $rel eq '<';
+        $rel = '>=' if $rel eq '>';
+        $self->rel($rel);
+    }
 
     croak "pkg is mandatory" unless $pkg or $self->alternatives;
 
@@ -283,15 +287,17 @@
             ^               # start from the beginning
             \s*             # stray space
             ([^\(\s]+)      # package name - no paren, no space
-            \s*             # oprional space
+            \s*             # optional space
             (?:             # version is optional
                 \(          # opening paren
                     (       # various relations 
                         <<
+                      | <
                       | <=
                       | =
                       | >=
                       | >>
+                      | >
                     )
                     \s*     # optional space
                     (.+)    # version