Author: rjung
Date: Mon Jan 31 22:26:52 2011
New Revision: 1065836

URL: http://svn.apache.org/viewvc?rev=1065836&view=rev
Log:
Fix permissions of version.sh in bin tarball.
Also reorder sh file list to make completeness
check more easy.

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/build/build.xml
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1065836&r1=1065835&r2=1065836&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jan 31 22:26:52 2011
@@ -84,9 +84,3 @@ PATCHES PROPOSED TO BACKPORT:
   (For convenience, here is patch that applies the above:
    http://people.apache.org/~kkolinko/patches/2011-01-22_tc55_50620.patch
   )
-
-* Fix permissions of version.sh in bin tarball
-  Also reorder sh file list to make completeness check more easy.
-  http://people.apache.org/~rjung/patches/fix-perms-version_sh.patch
-  +1: rjung, kkolinko, markt
-  -1:

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=1065836&r1=1065835&r2=1065836&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Mon Jan 31 22:26:52 2011
@@ -1737,12 +1737,13 @@
         <include name="bin/jasper.sh" />
         <include name="bin/jspc.sh" />
         <include name="bin/setclasspath.sh" />
-        <include name="bin/startup.sh" />
         <include name="bin/shutdown.sh" />
-        <include name="bin/tool-wrapper.sh" />
-        <include name="bin/tool-wrapper-using-launcher.sh" />
         <include name="bin/shutdown-using-launcher.sh" />
+        <include name="bin/startup.sh" />
         <include name="bin/startup-using-launcher.sh" />
+        <include name="bin/tool-wrapper.sh" />
+        <include name="bin/tool-wrapper-using-launcher.sh" />
+        <include name="bin/version.sh" />
       </tarfileset>
       <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
         <include name="conf/**" />
@@ -1768,12 +1769,13 @@
         <exclude name="bin/jasper.sh" />
         <exclude name="bin/jspc.sh" />
         <exclude name="bin/setclasspath.sh" />
-        <exclude name="bin/startup.sh" />
         <exclude name="bin/shutdown.sh" />
-        <exclude name="bin/tool-wrapper.sh" />
-        <exclude name="bin/tool-wrapper-using-launcher.sh" />
         <exclude name="bin/shutdown-using-launcher.sh" />
+        <exclude name="bin/startup.sh" />
         <exclude name="bin/startup-using-launcher.sh" />
+        <exclude name="bin/tool-wrapper.sh" />
+        <exclude name="bin/tool-wrapper-using-launcher.sh" />
+        <exclude name="bin/version.sh" />
         <exclude name="conf/**" />
         <exclude name="src/**" />
         <exclude name="server/webapps/admin/**" />

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1065836&r1=1065835&r2=1065836&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon Jan 31 
22:26:52 2011
@@ -39,6 +39,15 @@
 <!-- Section names:
  General, Catalina, Coyote, Jasper, Cluster, Webapps
 -->
+<section name="Tomcat 5.5.33 (jim)" rtext="">
+  <subsection name="General">
+    <changelog>
+      <fix>
+        Fix permissions of version.sh in bin tarball. (rjung)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 5.5.32 (jim)" rtext="tagged 2011-01-22">
   <subsection name="General">
     <changelog>



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

Reply via email to