Fix multiple copies of RUNNING.txt in full-docs.tar.gz

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

diff --git a/build.xml b/build.xml
index 680e9b5..a6ef381 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1813,7 +1813,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <include name="LICENSE" />
         <include name="NOTICE" />
         <include name="README.txt" />
-        <include name="RUNNING.txt" />
       </tarfileset>
       <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="tomcat-${version.major.minor}-doc">
         <include name="**" />

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57d2a4d..2e21508 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,11 @@
         Provide Javadoc for Servlet 3.0 API, JSP 2.2 API and EL 2.2 API.
         (markt)
       </add>
+      <fix>
+        Remove second copy of RUNNING.txt from the full-docs distribution. Some
+        unpacking utilities can't handle multiple copies of a file with the same
+        name in a directory. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">