perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1537770 - in /perl/modperl/branches/httpd24threading: ./ Makefile.PL
Date Thu, 31 Oct 2013 23:50:31 GMT
Author: stevehay
Date: Thu Oct 31 23:50:30 2013
New Revision: 1537770

URL: http://svn.apache.org/r1537770
Log:
Merged revision(s) 672737-672745 from perl/modperl/branches/threading:
silence a few unused warnings
........
allow for other suffixes than "-dev" or "-rc\d+" in our VERSION_STRING
........
reordered Changes: 2.0.5-threading1 item at the first place
........
remove the "-" from our VERSION_STRING to make it compatible with RPM versions
........

Modified:
    perl/modperl/branches/httpd24threading/   (props changed)
    perl/modperl/branches/httpd24threading/Makefile.PL

Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
  Merged /perl/modperl/branches/threading:r672737-672745

Modified: perl/modperl/branches/httpd24threading/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/Makefile.PL?rev=1537770&r1=1537769&r2=1537770&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/Makefile.PL (original)
+++ perl/modperl/branches/httpd24threading/Makefile.PL Thu Oct 31 23:50:30 2013
@@ -489,8 +489,8 @@ sub set_modperl_version {
 
     open my $fh, 'Changes';
     while (<$fh>) {
-        if (/^=item.*-(dev|rc\d+)/) {
-            $VERSION .= "-$1";
+        if (/^=item\s+\Q$VERSION\E-(\w+)/) {
+            $VERSION .= "$1";
             last;
         }
         last if /^=item/;



Mime
View raw message