make templates more robust to CRLF, closes: #595698

CVS version numbers

english/template/debian/events_common.wml: 1.38 -> 1.39 
english/template/debian/legal_lists.wml: 1.3 -> 1.4 
english/template/debian/navbar.wml: 1.86 -> 1.87 
english/template/debian/recent_list.wml: 1.140 -> 1.141 
english/template/debian/users_list.wml: 1.1 -> 1.2 
english/template/debian/votebar.wml: 1.117 -> 1.118

1 files changed, 18 insertions, 18 deletions

diff --git a/english/template/debian/recent_list.wml b/english/template/debian/recent_list.wml
index e0789626470..e4d8480fe5e 100644
--- a/english/template/debian/recent_list.wml
+++ b/english/template/debian/recent_list.wml
@@ -253,27 +253,27 @@ sub grab_titles {
 	    $where, $moreinfo, $startdate, $enddate, $repfile, $just);
 	my (@hdate, @rdate, @isodate) = ();
 	<protect pass=2>
-	if ($content =~ /^<define-tag pagetitle>\s*(.*?)\s*<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag pagetitle>\s*(.*?)\s*<\/define-tag>/ms) {
 	    $title = qq/$1/; }      # all
-	if ($content =~ /^<define-tag release_date>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag release_date>(.*?)<\/define-tag>/ms) {
 	    $date = qq/$1/; }       # News, news.XX.rdf
-	if ($content =~ /^<p>(.*?)<\/p>$/ms) {
+	if ($content =~ /^<p>(.*?)<\/p>/ms) {
             $moreinfo = qq/$1/; }   # news.XX.rdf  Should catch the first paragraph
-	if ($content =~ /^<define-tag where>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag where>(.*?)<\/define-tag>/ms) {
 	    $where = qq/$1/; }      # events
-	if ($content =~ /^<define-tag date>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag date>(.*?)<\/define-tag>/ms) {
 	    $date = qq/$1/; }       # events
-	if ($content =~ /^<define-tag description>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag description>(.*?)<\/define-tag>/ms) {
 	    $desc = qq/$1/; }       # security
-	if ($content =~ /^<define-tag justification>\s*(.*?)\s*<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag justification>\s*(.*?)\s*<\/define-tag>/ms) {
 	    $just = qq/$1/; }      # licenses
-	if ($content =~ /^<define-tag moreinfo>(?:(.*?<\/p>)|(.*?)<\/define-tag>)$/ms) {
+	if ($content =~ /^<define-tag moreinfo>(?:(.*?<\/p>)|(.*?)<\/define-tag>)/ms) {
 	    $moreinfo = qq/$1/; }   # dsa-long.XX.rdf
-	if ($content =~ /^<define-tag status>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag status>(.*?)<\/define-tag>/ms) {
 	    $status = qq/$1/; }     # vote
-	if ($content =~ /^<define-tag startdate>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag startdate>(.*?)<\/define-tag>/ms) {
 	    $startdate = qq/$1/; }	# startdate (events)
-	if ($content =~ /^<define-tag enddate>(.*?)<\/define-tag>$/ms) {
+	if ($content =~ /^<define-tag enddate>(.*?)<\/define-tag>/ms) {
 	    $enddate = $1; }        # enddate (events)
 	my ($shortfile) = $file =~ /^(?:.*\/)?(.*)\.wml$/;
 	if ($content =~ /<a\s+href="($shortfile-report)"\s*>/ms) {
@@ -304,9 +304,9 @@ sub grab_titles {
 		};
 	    <protect pass=2>
 	     foreach my $l (<DATAFILE>) {
-		 if ($l =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/)
+		 if ($l =~ /^<define-tag pagetitle>(.*)<\/define-tag>/)
 		 { $title = qq/$1/; }
-		 elsif ($l =~ /^<define-tag report_date>(.*)<\/define-tag>$/)
+		 elsif ($l =~ /^<define-tag report_date>(.*)<\/define-tag>/)
 		 { $rdate = qq/$1/; }
 	     }
 	    </protect>
@@ -395,13 +395,13 @@ sub grab_titles {
 	    <protect pass=2>
              my ( $free, $l_name );
 	     foreach my $l (<DATAFILE>) {
-		 if ($l =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/)
+		 if ($l =~ /^<define-tag pagetitle>(.*)<\/define-tag>/)
 		 { $title = qq/$1/; }
-		 if ($l =~ /^<define-tag license-name>(.*)<\/define-tag>$/)
+		 if ($l =~ /^<define-tag license-name>(.*)<\/define-tag>/)
 		 { $l_name = qq/$1/; }
-		 elsif ($l =~ /^<define-tag report_date>(.*)<\/define-tag>$/)
+		 elsif ($l =~ /^<define-tag report_date>(.*)<\/define-tag>/)
 		 { $rdate = qq/$1/; }
-		 elsif ($l =~ /^<define-tag isfree>(.*)<\/define-tag>$/)
+		 elsif ($l =~ /^<define-tag isfree>(.*)<\/define-tag>/)
 		 { $free = qq/$1/; }
 	     }
 	    </protect>
@@ -427,7 +427,7 @@ sub grab_titles {
 		};
 	    <protect pass=2>
 	     foreach my $l (<DATAFILE>) {
-		 if ($l =~ /^<define-tag release_date>(.*)<\/define-tag>$/)
+		 if ($l =~ /^<define-tag release_date>(.*)<\/define-tag>/)
 		 { $rdate = qq/$1/; }
 	     }
 	    </protect>