tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r698926 - in /tomcat/tc6.0.x/trunk: build.xml res/tomcat.nsi webapps/docs/changelog.xml
Date Thu, 25 Sep 2008 11:11:28 GMT
Author: markt
Date: Thu Sep 25 04:11:27 2008
New Revision: 698926

URL: http://svn.apache.org/viewvc?rev=698926&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
Move NOTICE file from docs webapp to install dir

Modified:
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=698926&r1=698925&r2=698926&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Sep 25 04:11:27 2008
@@ -334,7 +334,6 @@
     <copy todir="${tomcat.build}/webapps/docs">
       <fileset dir=".">
         <include name="BUILDING.txt"/>
-        <include name="NOTICE"/>
         <include name="RUNNING.txt"/>
       </fileset>
     </copy>

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=698926&r1=698925&r2=698926&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Sep 25 04:11:27 2008
@@ -136,6 +136,7 @@
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
+  File NOTICE
   SetOutPath $INSTDIR\lib
   File /r lib\*.*
   SetOutPath $INSTDIR\logs
@@ -668,6 +669,7 @@
   RMDir /r "$SMPROGRAMS\Apache Tomcat 6.0"
   Delete "$INSTDIR\tomcat.ico"
   Delete "$INSTDIR\LICENSE"
+  Delete "$INSTDIR\NOTICE"
   RMDir /r "$INSTDIR\bin"
   RMDir /r "$INSTDIR\lib"
   Delete "$INSTDIR\conf\*.dtd"

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698926&r1=698925&r2=698926&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 04:11:27 2008
@@ -144,6 +144,14 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>45879</bug>: Move NOTICE file from documentation webapp to the
+        installation directory. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.18 (remm)">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message