[pkg-java] r5132 - in trunk/libfreemarker-java/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-18 19:00:50 +0000 (Tue, 18 Dec 2007)
New Revision: 5132

Added:
   trunk/libfreemarker-java/debian/patches/jsp.diff
Modified:
   trunk/libfreemarker-java/debian/changelog
   trunk/libfreemarker-java/debian/patches/series
Log:
Disable support for jsp api < 2.1.

Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog	2007-12-18 12:49:19 UTC (rev 5131)
+++ trunk/libfreemarker-java/debian/changelog	2007-12-18 19:00:50 UTC (rev 5132)
@@ -1,6 +1,5 @@
 libfreemarker-java (2.3.11-1) unstable; urgency=low
 
-  UNRELEASED (3 jsp related build errors)
   * new upstream version
   * Bump up Standards-Version: 3.7.3 (no changes needed).
   * Refresh our patches.
@@ -9,8 +8,9 @@
   * Replace Build-Depends: libservlet2.4-java by glassfish-javaee.
   * Disable support for Sun's internal Xalan because we do not use the Sun
     compiler.
+  * Disable support for jsp api < 2.1.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 13:45:01 +0100
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 19:45:35 +0100
 
 libfreemarker-java (2.3.10-6) unstable; urgency=low
 

Added: trunk/libfreemarker-java/debian/patches/jsp.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp.diff	                        (rev 0)
+++ trunk/libfreemarker-java/debian/patches/jsp.diff	2007-12-18 19:00:50 UTC (rev 5132)
@@ -0,0 +1,13 @@
+Index: libfreemarker-java-2.3.11/build.xml
+===================================================================
+--- libfreemarker-java-2.3.11.orig/build.xml	2007-12-18 19:43:29.000000000 +0100
++++ libfreemarker-java-2.3.11/build.xml	2007-12-18 19:43:49.000000000 +0100
+@@ -419,8 +419,6 @@
+         <antcall target="compile-logkit"/>
+         <antcall target="compile-jdk14"/>
+         <antcall target="compile-jdk15"/>
+-        <antcall target="compile-jsp1"/>
+-        <antcall target="compile-jsp2"/>
+         <antcall target="compile-jython"/>
+         <antcall target="compile-dom4j"/>
+         <antcall target="compile-jdom"/>

Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series	2007-12-18 12:49:19 UTC (rev 5131)
+++ trunk/libfreemarker-java/debian/patches/series	2007-12-18 19:00:50 UTC (rev 5132)
@@ -3,3 +3,4 @@
 no-downloads.diff
 javacc-home.diff
 sun-xalan.diff
+jsp.diff