[pkg-java] r10673 - in trunk/libfreemarker-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Sep 27 21:00:29 UTC 2009
Author: drazzib
Date: 2009-09-27 21:00:29 +0000 (Sun, 27 Sep 2009)
New Revision: 10673
Added:
trunk/libfreemarker-java/debian/libfreemarker-java-doc.install
trunk/libfreemarker-java/debian/patches/javacc.diff
trunk/libfreemarker-java/debian/patches/jsp_api.diff
Removed:
trunk/libfreemarker-java/debian/build.xml
trunk/libfreemarker-java/debian/libfreemarker-java-doc.docs
Modified:
trunk/libfreemarker-java/debian/ant.properties
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/copyright
trunk/libfreemarker-java/debian/libfreemarker-java-doc.doc-base
trunk/libfreemarker-java/debian/patches/javarebel.diff
trunk/libfreemarker-java/debian/patches/jdom1.diff
trunk/libfreemarker-java/debian/patches/series
trunk/libfreemarker-java/debian/rules
Log:
* Build System:
- Use upstream build.xml instead of debian/build.xml
- Patch javacc.diff (use Debian JavaCC)
- Patch jsp_api.diff (disable JSP 1.0/2.0 building)
- Patch javarebel.diff (disable JavaRebel)
- Include ant-junit in DEB_JARS
* Install API Javadoc in /usr/share/doc/libfreemarker-java/api/
Modified: trunk/libfreemarker-java/debian/ant.properties
===================================================================
--- trunk/libfreemarker-java/debian/ant.properties 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/ant.properties 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,3 +1,4 @@
+all.libs.present=true
project.name=freemarker
class.dir=classes
source.dir=src
Deleted: trunk/libfreemarker-java/debian/build.xml
===================================================================
--- trunk/libfreemarker-java/debian/build.xml 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/build.xml 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
- <patternset id="compiler.resources">
- <include name="**/?*.properties" />
- </patternset>
-
- <target name="clean">
- <delete dir="${class.dir}" quiet="true"/>
- <delete file="${jar.name}" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/FMParser.java" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/FMParserConstants.java" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/FMParserTokenManager.java" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/SimpleCharStream.java" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/Token.java" quiet="true"/>
- <delete file="${source.dir}/freemarker/core/TokenMgrError.java" quiet="true"/>
- </target>
-
- <target name="javacc" description="Build the JavaCC parser from its grammar file">
- <javacc target="${source.dir}/freemarker/core/FMParser.jj"
- javacchome="/usr/share/java/" static="false"/>
-
- <replace file="src/freemarker/core/FMParserConstants.java"
- token="public interface FMParserConstants"
- value="interface FMParserConstants" />
- <replace file="${source.dir}/freemarker/core/FMParserTokenManager.java"
- token="public class FMParserTokenManager"
- value="class FMParserTokenManager" />
- <replace file="${source.dir}/freemarker/core/Token.java"
- token="public class Token"
- value="class Token" />
- <replace file="${source.dir}/freemarker/core/SimpleCharStream.java"
- token="public final class SimpleCharStream"
- value="final class SimpleCharStream" />
- <replace file="${source.dir}/freemarker/core/FMParser.java"
- token="enum"
- value="ENUM" />
- </target>
-
- <target name="compile" description="o Compile the code" depends="javacc">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- source="1.5" target="1.5" debug="true" optimize="false" nowarn="true">
- <exclude name="**/*SunInternalXalanXPathSupport.java"/>
- <exclude name="**/*FreeMarkerPageContext1.java"/>
- <exclude name="**/*FreeMarkerPageContext2.java"/>
- <exclude name="**/*FreeMarkerJspFactory2.java" />
- <exclude name="**/ext/beans/JavaRebelIntegration.java"/>
- </javac>
-
- <copy todir="${class.dir}">
- <fileset dir="${source.dir}">
- <patternset refid="compiler.resources" />
- </fileset>
- </copy>
- </target>
-
- <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${jar.name}" basedir="${class.dir}" />
- </target>
-
- <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc packagenames="freemarker.*"
- sourcepath="${source.dir}" destdir="${javadoc.dir}" />
- </target>
-
-</project>
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/changelog 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,10 +1,9 @@
-libfreemarker-java (2.3.15-1) UNRELEASED; urgency=low
+libfreemarker-java (2.3.15-1) unstable; urgency=low
[ Torsten Werner ]
* New upstream release
[ Damien Raude-Morvan ]
- * New patch javarebel.diff to disable JavaRebel
* Add myself as Uploaders
* Bump Standards-Version to 3.8.3:
- Move libfreemarker-java to "java" section
@@ -17,9 +16,16 @@
- Build-Depends libjdom1-java instead of libjdom0-java
- New jdom1.diff patch to build with new JDOM API
- Update DEB_JARS
+ * Build System:
+ - Use upstream build.xml instead of debian/build.xml
+ - Patch javacc.diff (use Debian JavaCC)
+ - Patch jsp_api.diff (disable JSP 1.0/2.0 building)
+ - Patch javarebel.diff (disable JavaRebel)
+ - Include ant-junit in DEB_JARS
* Remove unneeded shlibs:Depends variable
+ * Install API Javadoc in /usr/share/doc/libfreemarker-java/api/
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 27 Sep 2009 10:50:03 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 27 Sep 2009 22:31:38 +0200
libfreemarker-java (2.3.14-1) experimental; urgency=low
Modified: trunk/libfreemarker-java/debian/copyright
===================================================================
--- trunk/libfreemarker-java/debian/copyright 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/copyright 2009-09-27 21:00:29 UTC (rev 10673)
@@ -6,7 +6,7 @@
Upstream Authors: The Visigoth Software Society
-Copyright: (c) 2003 The Visigoth Software Society. All rights reserved.
+Copyright 2003 The Visigoth Software Society. All rights reserved.
License:
Redistribution and use in source and binary forms, with or without
@@ -43,5 +43,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-The Debian packaging is (C) 2007, Torsten Werner <twerner at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is
+Copyright 2007, Torsten Werner <twerner at debian.org>
+Copyright 2009, Damien Raude-Morvan <drazzib at debian.org>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: trunk/libfreemarker-java/debian/libfreemarker-java-doc.doc-base
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java-doc.doc-base 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/libfreemarker-java-doc.doc-base 2009-09-27 21:00:29 UTC (rev 10673)
@@ -7,5 +7,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libfreemarker-java-doc/api/index.html
-Files: /usr/share/doc/libfreemarker-java-doc/api/*.html
+Index: /usr/share/doc/libfreemarker-java/api/index.html
+Files: /usr/share/doc/libfreemarker-java/api/*.html
Deleted: trunk/libfreemarker-java/debian/libfreemarker-java-doc.docs
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java-doc.docs 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/libfreemarker-java-doc.docs 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,2 +0,0 @@
-docs/*
-README.txt
Copied: trunk/libfreemarker-java/debian/libfreemarker-java-doc.install (from rev 10668, trunk/libfreemarker-java/debian/libfreemarker-java-doc.docs)
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java-doc.install (rev 0)
+++ trunk/libfreemarker-java/debian/libfreemarker-java-doc.install 2009-09-27 21:00:29 UTC (rev 10673)
@@ -0,0 +1,2 @@
+build/api /usr/share/doc/libfreemarker-java/
+README.txt /usr/share/doc/libfreemarker-java/
Added: trunk/libfreemarker-java/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff (rev 0)
+++ trunk/libfreemarker-java/debian/patches/javacc.diff 2009-09-27 21:00:29 UTC (rev 10673)
@@ -0,0 +1,20 @@
+Description: Use JavaCC from Debian
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/build.xml
++++ b/build.xml
+@@ -410,11 +410,11 @@
+ description="Build the JavaCC parser from its grammar file">
+ <!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ -->
+ <copy todir="${build.javacc.dir}/freemarker/core" file="${src.dir}/freemarker/core/ParseException.java" />
+- <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="lib/javacc.jar"/>
++ <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"/>
+ <javacc
+ target="${src.dir}/freemarker/core/FMParser.jj"
+ outputdirectory="src/freemarker/core"
+- javacchome="lib"
++ javacchome="/usr/share/java/" jdkversion="1.3"
+ />
+ <replace
+ file="src/freemarker/core/FMParserConstants.java"
Modified: trunk/libfreemarker-java/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,6 +1,8 @@
Description:
Disable JavaRebelIntegration (no yet in Debian and non-free stuff)
+Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
--- a/src/freemarker/ext/beans/BeansWrapper.java
+++ b/src/freemarker/ext/beans/BeansWrapper.java
@@ -232,7 +232,6 @@
@@ -24,3 +26,13 @@
- }
}
}
+--- a/build.xml
++++ b/build.xml
+@@ -147,6 +147,7 @@
+ <exclude name="freemarker/core/RegexBuiltins.java"/>
+ <exclude name="freemarker/ext/ant/**"/>
+ <exclude name="freemarker/ext/beans/EnumModels.java"/>
++ <exclude name="freemarker/ext/beans/JavaRebelIntegration.java"/>
+ <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
+ <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
+ <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
Modified: trunk/libfreemarker-java/debian/patches/jdom1.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jdom1.diff 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/patches/jdom1.diff 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,3 +1,7 @@
+Description: Compatibility with JDOM 1.x API
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
--- a/src/freemarker/ext/jdom/NodeListModel.java
+++ b/src/freemarker/ext/jdom/NodeListModel.java
@@ -734,7 +734,7 @@
@@ -5,7 +9,7 @@
attr = new Attribute("data", pi.getData());
else
- attr = new Attribute(localName, pi.getValue(localName));
-+ attr = new Attribute(localName, pi.getValue());
++ attr = new Attribute(localName, pi.getPseudoAttributeValue(localName));
} else if (node instanceof DocType) {
DocType doctype = (DocType)node;
if ("publicId".equals(localName))
@@ -66,7 +70,7 @@
}
else {
- result.add(new Attribute(localName, pi.getValue(localName)));
-+ result.add(new Attribute(localName, pi.getValue()));
++ result.add(new Attribute(localName, pi.getPseudoAttributeValue(localName)));
}
} else if (node instanceof DocType) {
DocType doctype = (DocType)node;
Added: trunk/libfreemarker-java/debian/patches/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff (rev 0)
+++ trunk/libfreemarker-java/debian/patches/jsp_api.diff 2009-09-27 21:00:29 UTC (rev 10673)
@@ -0,0 +1,32 @@
+Description: Remove JSP 1.x and 2.0 API usage
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/build.xml
++++ b/build.xml
+@@ -79,8 +79,6 @@
+ </path>
+
+ <path id="compile.jsp1.classpath">
+- <path refid="compile.nojsp.classpath"/>
+- <pathelement path="${lib.jsp12}"/>
+ </path>
+
+ <path id="compile.jsp2.classpath">
+@@ -219,7 +217,6 @@
+ </patternset>
+
+ <patternset id="freemarker.compile.jsp1">
+- <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
+ </patternset>
+
+ <patternset id="freemarker.compile.jsp2">
+@@ -480,8 +477,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 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/patches/series 2009-09-27 21:00:29 UTC (rev 10673)
@@ -1,3 +1,5 @@
class_name.diff
javarebel.diff
jdom1.diff
+javacc.diff
+jsp_api.diff
Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2009-09-27 20:51:18 UTC (rev 10672)
+++ trunk/libfreemarker-java/debian/rules 2009-09-27 21:00:29 UTC (rev 10673)
@@ -5,13 +5,15 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar javadoc
+
+DEB_ANT_BUILD_TARGET := javacc jar javadoc
+DEB_ANT_CHECK_TARGET := test
+
DEB_JARS := ant-nodeps dom4j servlet-api-2.5 el-api-2.1 jsp-api-2.1 jaxen jdom1 js junit \
- jython log4j-1.2 logkit xercesImpl jsp-api xalan2 commons-jxpath
+ jython log4j-1.2 logkit xercesImpl jsp-api xalan2 commons-jxpath ant-junit
install/libfreemarker-java::
- install -m 644 -D freemarker.jar \
+ install -m 644 -D lib/freemarker.jar \
debian/libfreemarker-java/usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar
dh_link -plibfreemarker-java \
/usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar \
More information about the pkg-java-commits
mailing list