[SCM] Debian packaging of libuuid-perl branch, master, updated. 5d5451920814f79b82362c625493a03d73dcc3aa

[gregor herrmann]

The following commit has been merged in the master branch:
commit 5d5451920814f79b82362c625493a03d73dcc3aa
Merge: 66be333c8765687f9707ad2a75898cc021e4aeb1 b7f5f77780585c947ac70e12d4ebaf2f1a131586
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Oct 14 18:17:15 2012 +0200

    Merge branch 'sid'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index f767508,a4e7428..a794c82
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,26 @@@
- libuuid-perl (0.02-5) UNRELEASED; urgency=low
++libuuid-perl (0.02-6) UNRELEASED; urgency=low
 +
 +  [ Ansgar Burchardt ]
 +  * Update my email address.
 +  * debian/control: Convert Vcs-* fields to Git.
 +
 +  [ Salvatore Bonaccorso ]
 +  * debian/copyright: Replace DEP5 Format-Specification URL from
 +    svn.debian.org to anonscm.debian.org URL.
 +
 + -- Ansgar Burchardt <ansgar at debian.org>  Mon, 01 Nov 2010 11:17:33 +0100
 +
+ libuuid-perl (0.02-5) unstable; urgency=low
+ 
+   * debian/control: conflict on doc-base << 0.10.3 to avoid package
+     installation failure due to symbol lookup errors when perl 5.14 and
+     libuuid-perl get unpacked and trigger the old doc-base.
+     Thanks to Martin Pitt for testing this in Ubuntu, Niko Tyni for the
+     initial analysis, and Stuart Prescott for further triaging.
+     (Closes: #652638) (LP: #902553)
+ 
+  -- gregor herrmann <gregoa at debian.org>  Sun, 14 Oct 2012 18:09:59 +0200
+ 
  libuuid-perl (0.02-4) unstable; urgency=low
  
    [ gregor herrmann ]
diff --combined debian/control
index b37a8dc,39094f8..182db67
--- a/debian/control
+++ b/debian/control
@@@ -4,15 -4,16 +4,16 @@@ Priority: optiona
  Build-Depends: debhelper (>= 7.0.50~), perl, uuid-dev
  Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
  Uploaders: gregor herrmann <gregoa at debian.org>,
 - Ansgar Burchardt <ansgar at 43-1.org>
 + Ansgar Burchardt <ansgar at debian.org>
  Standards-Version: 3.9.0
  Homepage: http://search.cpan.org/dist/UUID/
 -Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libuuid-perl/
 -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libuuid-perl/
 +Vcs-Git: git://git.debian.org/pkg-perl/packages/libuuid-perl.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libuuid-perl.git
  
  Package: libuuid-perl
  Architecture: any
  Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+ Conflicts: doc-base (<< 0.10.3)
  Description: Perl extension for using UUID interfaces as defined in e2fsprogs
   This is a Perl interface to libuuid from e2fsprogs.  It allows generation,
   parsing, and unparsing of UUIDs.

-- 
Debian packaging of libuuid-perl