From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 12 Nov 2009 11:20:43 +0000 (+0000)
Subject: Followup to r.817822 and r.833545
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dcbda8a74e60dcf8ba99d4cb666ded8268e3260b;p=tomcat7.0

Followup to r.817822 and r.833545
You have to specify explicit encoding in a fixcrlf task

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835336 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/dist.xml b/dist.xml
index 61ac1a7c5..f3ff9466d 100644
--- a/dist.xml
+++ b/dist.xml
@@ -278,7 +278,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
   	<!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
          displayed post-install -->
     <fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
-        includes="RELEASE-NOTES.txt" eol="crlf" />
+        includes="RELEASE-NOTES.txt" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
     <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" overwrite="true" encoding="ISO-8859-1">
       <filterset refid="version.filters"/>
     </copy>
@@ -294,7 +294,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
   	<!-- Restore original line ending-->
     <fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
-        includes="RELEASE-NOTES.txt" />
+        includes="RELEASE-NOTES.txt" encoding="ISO-8859-1" fixlast="false" />
 
     <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />