From: Norman Walsh <ndw@nwalsh.com>
Date: Sun, 22 Aug 2004 14:05:31 +0000 (+0000)
Subject: Support fm:Version
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da2f5511999c213350347f2e1b45003dceb53f21;p=docbook-dsssl

Support fm:Version
---

diff --git a/cvstools/mergechangelogs b/cvstools/mergechangelogs
index 8f033a3f5..52e455c51 100755
--- a/cvstools/mergechangelogs
+++ b/cvstools/mergechangelogs
@@ -109,7 +109,7 @@ sub format {
 	if (/^(.{1,60})\s/) {
 	    print "  | \t$star $1\n";
 	    $star = " ";
-	    $_ = $';
+	    $_ = $'; # '
 	} else {
 	    print "  | \t$star $_\n";
 	    $_ = "";
@@ -129,6 +129,8 @@ sub last_version {
 
     if (/name=.VERSION.>(.*?)</s) {
 	$version = $1;
+    } elsif (/<fm:Version>(.*?)</s) {
+	$version = $1;
     } elsif (/^([\d\.]+)/) {
 	$version = $1;
     } else {