r58644 - 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:36:23 2010
New Revision: 58644

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58644
Log:
Debian::Dependency: Allow architecture restrictions in dependencies.
For now this information is just ignored.

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=58644&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat May 29 14:36:23 2010
@@ -7,6 +7,8 @@
   [ Ansgar Burchardt ]
   * Do not require --cpan in addition to --pkg-perl when adding Vcs-* fields.
   * Debian::Dependency: Recognize deprecated '<' and '>' relations.
+  * Debian::Dependency: Allow architecture restrictions in dependencies.
+    For now this information is just ignored.
 
  -- 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=58644&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Dependency.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Dependency.pm Sat May 29 14:36:23 2010
@@ -303,6 +303,16 @@
                     (.+)    # version
                 \)          # closing paren
             )?
+            \s*             # optional space
+            (?:             # architecture is optional
+                \[
+                    (?:
+                        !?             # negation is optional
+                        [^\s\]]+       # architecture name
+                        (?:\s+|(?=\])) # whitespace or end
+                    )+
+                \]
+            )?
             $}x    # done
         )
     {