commit 7686ee29ed7831bf86e41e1938b34a5206f46864
Merge: 4586ad9 0531b28
Author: Jitka Plesnikova <jples...@redhat.com>
Date:   Fri Jun 1 10:34:49 2012 +0200

    Merge branch 'rc/master' of ssh://pkgs.fedoraproject.org/perl into rc/master
    
    Conflicts:
        perl.spec
    
        modified:   perl.spec

 perl.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc perl.spec
index 46f81a1,a3972ca..e8c2e72
--- a/perl.spec
+++ b/perl.spec
@@@ -2451,9 -2454,9 +2451,12 @@@ sed 
  
  # Old changelog entries are preserved in CVS.
  %changelog
- * Fri Jun  1 2012 Jitka Plesnikova <jples...@redhat.com> - 4:5.16.0-217
++* Fri Jun  1 2012 Jitka Plesnikova <jples...@redhat.com> - 4:5.16.0-218
 +- Fix find2perl to translate ? glob properly (bug #825701)
 +
+ * Thu May 31 2012 Petr Pisar <ppi...@redhat.com> - 4:5.16.0-218
+ - Shorten perl-Module-Build version to 2 digits to follow upstream
+ 
  * Fri May 25 2012 Marcela Mašláňová <mmasl...@redhat.com> - 4:5.16.0-217
  - upload the stable 5.16.0
  
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel

Reply via email to