[SCM] Debian branch, master, updated. debian/1.2.3-1-5-gb04e10c

[Florian Schlichting]

The following commit has been merged in the master branch:
commit b04e10c5d0e7e4bfa6e6ff862689275a5ba85f61
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sat Apr 27 22:51:16 2013 +0200

    switch the order of alternative build dependencies
    
    We need to have the "commonly used" alternative first, as some of our
    tools (e.g. sbuild) unfortunately cannot deal with alternative
    dependencies in a useful way, and will only look at the first
    alternative. In current unstable, libwww-perl (<< 6) is unsatisfiable.

diff --git a/debian/changelog b/debian/changelog
index fc53788..62dce1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ lemonldap-ng (1.2.4-1) unstable; urgency=low
 
   * Imported upstream version 1.2.4
   * Replace libhttp-message-perl dependency by
-    "libwww-perl (<< 6) | libhttp-message-perl"
+    "libhttp-message-perl | libwww-perl (<< 6)"
 
  -- Xavier Guimard <x.guimard at free.fr>  Wed, 24 Apr 2013 07:05:48 +0200
 
diff --git a/debian/control b/debian/control
index 3827a22..a2734f8 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends-Indep: libapache-session-perl,
                      libtest-mockobject-perl,
                      libtest-pod-perl,
                      liburi-perl,
-                     libwww-perl (<< 6) | libhttp-message-perl,
+                     libhttp-message-perl | libwww-perl (<< 6),
                      libwww-perl,
                      libxml-libxml-perl,
                      libxml-libxslt-perl,
@@ -87,7 +87,7 @@ Depends: ${misc:Depends},
          liblemonldap-ng-conf-perl (= ${binary:Version}),
          libwww-perl
 Recommends: libapache-session-browseable-perl,
-            libwww-perl (<< 6) | libhttp-message-perl
+            libhttp-message-perl | libwww-perl (<< 6)
 Suggests: libcache-memcached-perl,
           libdigest-hmac-perl,
           liblemonldap-ng-portal-perl,
@@ -123,7 +123,7 @@ Depends: ${misc:Depends},
          libsoap-lite-perl
 Recommends: libhtml-template-perl,
             libnet-ldap-perl,
-            libwww-perl (<< 6) | libhttp-message-perl,
+            libhttp-message-perl | libwww-perl (<< 6),
             libxml-libxml-perl,
             libxml-simple-perl
 Description: Lemonldap::NG common files
@@ -195,7 +195,7 @@ Suggests: libauthcas-perl,
           libsoap-lite-perl,
           libstring-random-perl,
           liburi-perl,
-          libwww-perl (<< 6) | libhttp-message-perl,
+          libhttp-message-perl | libwww-perl (<< 6),
           libwww-perl,
           libxml-libxml-perl,
           libxml-libxslt-perl,

-- 
Debian