[pkg-java] r11513 - trunk/jetty5/debian/patches

[Niels Thykier]

Author: nthykier-guest
Date: 2010-02-06 15:14:39 +0000 (Sat, 06 Feb 2010)
New Revision: 11513

Removed:
   trunk/jetty5/debian/patches/build-test-no-depend-on-javadoc.patch
Modified:
   trunk/jetty5/debian/patches/remove-import-from-sun.patch
   trunk/jetty5/debian/patches/sunjsse-disable.patch
   trunk/jetty5/debian/patches/z_fix_build-deps.patch
Log:
Added patch descriptions and removed another obsolete patch.

Deleted: trunk/jetty5/debian/patches/build-test-no-depend-on-javadoc.patch
===================================================================
--- trunk/jetty5/debian/patches/build-test-no-depend-on-javadoc.patch	2010-02-06 15:00:22 UTC (rev 11512)
+++ trunk/jetty5/debian/patches/build-test-no-depend-on-javadoc.patch	2010-02-06 15:14:39 UTC (rev 11513)
@@ -1,11 +0,0 @@
---- build.xml.orig	2005-08-06 17:27:29.204125585 +0200
-+++ build.xml	2005-08-06 17:27:35.845809517 +0200
-@@ -402,7 +402,7 @@
-   <!-- ==================================================================== -->
-   <target name="tests" depends="test"/>
-   <target name="test" 
--          depends="webapps,javadoc"
-+          depends="webapps"
-           description="Build and run the test harnesses">
-     <ant  dir="." antfile="${test}/build.xml" inheritAll="false" target="test"/>
-   </target>

Modified: trunk/jetty5/debian/patches/remove-import-from-sun.patch
===================================================================
--- trunk/jetty5/debian/patches/remove-import-from-sun.patch	2010-02-06 15:00:22 UTC (rev 11512)
+++ trunk/jetty5/debian/patches/remove-import-from-sun.patch	2010-02-06 15:14:39 UTC (rev 11513)
@@ -1,3 +1,5 @@
+Description: Remove unused import.
+
 Index: jetty5-5.1.15+dfsg/src/org/mortbay/servlet/PostFileFilter.java
 ===================================================================
 --- jetty5-5.1.15+dfsg.orig/src/org/mortbay/servlet/PostFileFilter.java	2010-02-06 15:18:56.102282896 +0100

Modified: trunk/jetty5/debian/patches/sunjsse-disable.patch
===================================================================
--- trunk/jetty5/debian/patches/sunjsse-disable.patch	2010-02-06 15:00:22 UTC (rev 11512)
+++ trunk/jetty5/debian/patches/sunjsse-disable.patch	2010-02-06 15:14:39 UTC (rev 11513)
@@ -1,3 +1,5 @@
+Description: Conditionally build using Sun JSSE.
+
 Index: jetty5-5.1.15+dfsg/build.xml
 ===================================================================
 --- jetty5-5.1.15+dfsg.orig/build.xml	2010-02-06 15:21:04.086282627 +0100

Modified: trunk/jetty5/debian/patches/z_fix_build-deps.patch
===================================================================
--- trunk/jetty5/debian/patches/z_fix_build-deps.patch	2010-02-06 15:00:22 UTC (rev 11512)
+++ trunk/jetty5/debian/patches/z_fix_build-deps.patch	2010-02-06 15:14:39 UTC (rev 11513)
@@ -1,3 +1,6 @@
+Description: Fixes the clean+tidy+prepare targets, so they gracefully handle the missing sources
+ and removes a dependency on servlet.jar that is not necessary.
+
 --- a/build.xml	2010-02-06 15:43:51.081305314 +0100
 +++ b/build.xml	2010-02-06 15:44:37.481283838 +0100
 @@ -104,7 +104,7 @@