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

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-18 12:49:19 +0000 (Tue, 18 Dec 2007)
New Revision: 5131

Added:
   trunk/libfreemarker-java/debian/patches/sun-xalan.diff
Modified:
   trunk/libfreemarker-java/debian/changelog
   trunk/libfreemarker-java/debian/control
   trunk/libfreemarker-java/debian/patches/series
   trunk/libfreemarker-java/debian/rules
Log:
UNRELEASED (3 jsp related build errors)
* Add patch javacc-home.diff to make the path configurable.
* Replace Build-Depends: libservlet2.4-java by glassfish-javaee.
* Disable support for Sun's internal Xalan because we do not use the Sun
  compiler.

Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog	2007-12-18 12:28:33 UTC (rev 5130)
+++ trunk/libfreemarker-java/debian/changelog	2007-12-18 12:49:19 UTC (rev 5131)
@@ -1,13 +1,16 @@
 libfreemarker-java (2.3.11-1) unstable; urgency=low
 
-  UNRELEASED (needs tomcat6)
+  UNRELEASED (3 jsp related build errors)
   * new upstream version
   * Bump up Standards-Version: 3.7.3 (no changes needed).
   * Refresh our patches.
   * Add patch no-downloads.diff to avoid any downloads of binary jars.
-  * Add patch javacc-home.diff to make the path configurable. 
+  * Add patch javacc-home.diff to make the path configurable.
+  * Replace Build-Depends: libservlet2.4-java by glassfish-javaee.
+  * Disable support for Sun's internal Xalan because we do not use the Sun
+    compiler.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 16 Dec 2007 13:02:10 +0100
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 13:45:01 +0100
 
 libfreemarker-java (2.3.10-6) unstable; urgency=low
 

Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control	2007-12-18 12:28:33 UTC (rev 5130)
+++ trunk/libfreemarker-java/debian/control	2007-12-18 12:49:19 UTC (rev 5131)
@@ -4,10 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev, javacc,
- junit, jython, libdom4j-java, libjaxen-java, libjdom0-java,
- liblog4j1.2-java, liblogkit-java, libservlet2.4-java, libxerces2-java,
- rhino
+Build-Depends-Indep: ant, ant-optional, glassfish-javaee, java-gcj-compat-dev,
+ javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom0-java,
+ liblog4j1.2-java, liblogkit-java, libxerces2-java, rhino
 Standards-Version: 3.7.3
 Homepage: http://www.freemarker.org/	
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java

Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series	2007-12-18 12:28:33 UTC (rev 5130)
+++ trunk/libfreemarker-java/debian/patches/series	2007-12-18 12:49:19 UTC (rev 5131)
@@ -2,3 +2,4 @@
 java-version.diff
 no-downloads.diff
 javacc-home.diff
+sun-xalan.diff

Added: trunk/libfreemarker-java/debian/patches/sun-xalan.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/sun-xalan.diff	                        (rev 0)
+++ trunk/libfreemarker-java/debian/patches/sun-xalan.diff	2007-12-18 12:49:19 UTC (rev 5131)
@@ -0,0 +1,12 @@
+Index: libfreemarker-java-2.3.11/build.xml
+===================================================================
+--- libfreemarker-java-2.3.11.orig/build.xml	2007-12-18 13:43:58.000000000 +0100
++++ libfreemarker-java-2.3.11/build.xml	2007-12-18 13:44:08.000000000 +0100
+@@ -180,7 +180,6 @@
+ 
+     <patternset id="freemarker.compile.jdk15">
+         <include name="freemarker/ext/beans/EnumModels.java"/>
+-        <include name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
+     </patternset>
+ 
+     <patternset id="freemarker.compile.xalan">

Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules	2007-12-18 12:28:33 UTC (rev 5130)
+++ trunk/libfreemarker-java/debian/rules	2007-12-18 12:49:19 UTC (rev 5131)
@@ -6,8 +6,8 @@
 
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET := all
-DEB_JARS 	     := ant-nodeps dom4j jaxen jdom0 js jsp-api-2.0 junit jython \
-			log4j-1.2 logkit xercesImpl
+DEB_JARS 	     := ant-nodeps dom4j glassfish-javaee jaxen jdom0 js junit \
+                        jython log4j-1.2 logkit xercesImpl
 
 install/libfreemarker-java::
 	install -m 644 -D lib/freemarker.jar $(DEB_DESTDIR)/usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar