[SCM] Debian packaging of libio-async-perl branch, master, updated. debian/0.45-1-34-gd222383

intrigeri intrigeri at boum.org
Thu Jun 28 15:17:42 UTC 2012


The following commit has been merged in the master branch:
commit d2223830681a64e611f545eabe891bf456cfe6df
Merge: 48fea145c283abc166636e655c58724358a2a814 b386bd91247fddd00de70f9b50c44ebf665f6be6
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Jun 28 17:17:07 2012 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/control
index 0a967c0,74cf5e3..29818f0
--- a/debian/control
+++ b/debian/control
@@@ -2,16 -2,14 +2,15 @@@ Source: libio-async-per
  Section: perl
  Priority: optional
  Build-Depends: debhelper (>= 8), perl
- Build-Depends-Indep: netbase,
-  perl (>= 5.14) | libsocket-getaddrinfo-perl,
-  perl (>= 5.15.6) | libsocket-perl (>= 1.95),
+ Build-Depends-Indep: libasync-mergepoint-perl (>= 0.03),
+  libcps-perl,
   libtest-fatal-perl,
-  libasync-mergepoint-perl (>= 0.03),
-  libtest-refcount-perl,
-  libtest-pod-perl,
   libtest-identity-perl,
-  libcps-perl,
-  perl-modules
+  libtest-pod-perl,
+  libtest-refcount-perl,
+  netbase,
 - perl (>= 5.14) | libsocket-getaddrinfo-perl
++ perl (>= 5.14) | libsocket-getaddrinfo-perl,
++ perl (>= 5.15.6) | libsocket-perl (>= 1.95)
  Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
  Uploaders: Jonathan Yu <jawnsy at cpan.org>,
   gregor herrmann <gregoa at debian.org>, Nicholas Bamber <nicholas at periapt.co.uk>
@@@ -23,11 -21,9 +22,10 @@@ Vcs-Browser: http://anonscm.debian.org/
  Package: libio-async-perl
  Architecture: all
  Depends: ${misc:Depends}, ${perl:Depends},
-  perl (>= 5.14) | libsocket-getaddrinfo-perl,
-  perl (>= 5.15.6) | libsocket-perl (>= 1.95),
-  libcps-perl,
   libasync-mergepoint-perl (>= 0.03),
-  perl-modules
+  libcps-perl,
 - perl (>= 5.14) | libsocket-getaddrinfo-perl
++ perl (>= 5.14) | libsocket-getaddrinfo-perl,
++ perl (>= 5.15.6) | libsocket-perl (>= 1.95)
  Breaks: libio-async-loop-epoll-perl (<< 0.09),
   libio-async-loop-glib-perl (<< 0.19)
  Description: module providing asynchronous filehandle I/O

-- 
Debian packaging of libio-async-perl



More information about the Pkg-perl-cvs-commits mailing list