[pkg-java] r5055 - in trunk/libfreemarker-java/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 16 12:26:53 UTC 2007
Author: twerner
Date: 2007-12-16 12:26:53 +0000 (Sun, 16 Dec 2007)
New Revision: 5055
Added:
trunk/libfreemarker-java/debian/patches/javacc-home.diff
trunk/libfreemarker-java/debian/patches/no-downloads.diff
Modified:
trunk/libfreemarker-java/debian/ant.properties
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/control
trunk/libfreemarker-java/debian/orig-tar.sh
trunk/libfreemarker-java/debian/patches/class_name.diff
trunk/libfreemarker-java/debian/patches/java-version.diff
trunk/libfreemarker-java/debian/patches/series
Log:
UNRELEASED (needs tomcat6)
* 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.
Modified: trunk/libfreemarker-java/debian/ant.properties
===================================================================
--- trunk/libfreemarker-java/debian/ant.properties 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/ant.properties 2007-12-16 12:26:53 UTC (rev 5055)
@@ -2,7 +2,6 @@
lib.jdom=
lib.jaxen=
lib.saxpath=
-lib.servlet23=/usr/share/java/servlet-2.3.jar
#jython.home=
lib.log4j=
lib.logkit=
@@ -11,5 +10,6 @@
lib.dom4j=
lib.ant=
lib.rhino=
-lib.servlet24=/usr/share/java/servlet-api-2.4
-
+lib.servlet=/usr/share/java/servlet-api.jar
+all.libs.present=true
+build.sysclasspath=first
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/changelog 2007-12-16 12:26:53 UTC (rev 5055)
@@ -1,3 +1,14 @@
+libfreemarker-java (2.3.11-1) unstable; urgency=low
+
+ UNRELEASED (needs tomcat6)
+ * 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.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 16 Dec 2007 13:02:10 +0100
+
libfreemarker-java (2.3.10-6) unstable; urgency=low
* Move the package to pkg-java svn.
Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/control 2007-12-16 12:26:53 UTC (rev 5055)
@@ -6,9 +6,9 @@
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.3-java,
- libservlet2.4-java, libxerces2-java, rhino
-Standards-Version: 3.7.2
+ liblog4j1.2-java, liblogkit-java, libservlet2.4-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
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libfreemarker-java
Property changes on: trunk/libfreemarker-java/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/libfreemarker-java/debian/patches/class_name.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/class_name.diff 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/patches/class_name.diff 2007-12-16 12:26:53 UTC (rev 5055)
@@ -1,21 +1,21 @@
-Index: libfreemarker-java-2.3.10/src/freemarker/ext/jython/JythonHashModel.java
+Index: libfreemarker-java-2.3.11/src/freemarker/ext/jython/JythonHashModel.java
===================================================================
---- libfreemarker-java-2.3.10.orig/src/freemarker/ext/jython/JythonHashModel.java 2007-04-20 18:36:15.000000000 +0530
-+++ libfreemarker-java-2.3.10/src/freemarker/ext/jython/JythonHashModel.java 2007-11-17 01:35:21.000000000 +0530
+--- libfreemarker-java-2.3.11.orig/src/freemarker/ext/jython/JythonHashModel.java 2007-12-05 01:36:43.000000000 +0100
++++ libfreemarker-java-2.3.11/src/freemarker/ext/jython/JythonHashModel.java 2007-12-16 12:49:46.000000000 +0100
@@ -137,7 +137,7 @@
- {
- throw new TemplateModelException(e);
- }
-- throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
-+ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType().getFullName());
- }
-
- /**
+ {
+ throw new TemplateModelException(e);
+ }
+- throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
++ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType().getFullName());
+ }
+
+ /**
@@ -157,6 +157,6 @@
- {
- throw new TemplateModelException(e);
- }
-- throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+ {
+ throw new TemplateModelException(e);
+ }
+- throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType().getFullName());
- }
- }
+ }
+ }
Modified: trunk/libfreemarker-java/debian/patches/java-version.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/java-version.diff 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/patches/java-version.diff 2007-12-16 12:26:53 UTC (rev 5055)
@@ -1,94 +1,103 @@
-Index: libfreemarker-java-2.3.10/build.xml
+Index: libfreemarker-java-2.3.11/build.xml
===================================================================
---- libfreemarker-java-2.3.10.orig/build.xml 2007-09-18 22:11:51.000000000 +0200
-+++ libfreemarker-java-2.3.10/build.xml 2007-09-18 22:13:03.000000000 +0200
-@@ -352,7 +352,7 @@
- <target depends="init, prepare, javacc" name="compile"
- description="Compile Java source files">
- <mkdir dir="${build.classes.dir}"/>
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" source="1.2" target="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" source="1.3" target="1.3">
- <src path="${src.dir}"/>
- <patternset refid="freemarker.compile"/>
- <!-- src path="${build.javacc.dir}"/ -->
-@@ -379,7 +379,7 @@
- </target>
-
- <target name="compile-log4j" if="log4j.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.log4j"/>
-@@ -387,7 +387,7 @@
- </target>
-
- <target name="compile-logkit" if="logkit.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.logkit"/>
-@@ -411,7 +411,7 @@
- </target>
-
- <target name="compile-jython" if="jython.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jython"/>
-@@ -419,7 +419,7 @@
- </target>
-
- <target name="compile-jsp2" if="jsp2.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.jsp2.classpath"/>
- <patternset refid="freemarker.compile.jsp2"/>
-@@ -427,7 +427,7 @@
- </target>
-
- <target name="compile-rhino" if="rhino.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.rhino"/>
-@@ -435,7 +435,7 @@
- </target>
-
- <target name="compile-dom4j" if="dom4j.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.dom4j"/>
-@@ -443,7 +443,7 @@
- </target>
-
- <target name="compile-jaxen" if="jaxen.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jaxen"/>
-@@ -451,7 +451,7 @@
- </target>
-
- <target name="compile-jdom" if="jdom.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jdom"/>
-@@ -463,7 +463,7 @@
- destdir="${build.classes.dir}"
- debug="on"
- optimize="off"
-- target="1.2" source="1.2">
-+ target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.xalan"/>
+--- libfreemarker-java-2.3.11.orig/build.xml 2007-12-05 01:36:34.000000000 +0100
++++ libfreemarker-java-2.3.11/build.xml 2007-12-16 12:51:03.000000000 +0100
+@@ -433,7 +433,7 @@
+ <target depends="init, prepare, javacc" name="compile"
+ description="Compile Java source files">
+ <mkdir dir="${build.classes.dir}"/>
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="lib/rt122.jar" source="1.2" target="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="lib/rt122.jar" source="1.3" target="1.3">
+ <src path="${src.dir}"/>
+ <patternset refid="freemarker.compile"/>
+ <!-- src path="${build.javacc.dir}"/ -->
+@@ -461,7 +461,7 @@
+ </target>
+
+ <target name="compile-log4j" if="log4j.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.log4j"/>
+@@ -469,7 +469,7 @@
+ </target>
+
+ <target name="compile-logkit" if="logkit.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.logkit"/>
+@@ -493,7 +493,7 @@
+ </target>
+
+ <target name="compile-jython" if="jython.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.jython"/>
+@@ -501,7 +501,7 @@
+ </target>
+
+ <target name="compile-jsp1">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.jsp1.classpath"/>
+ <patternset refid="freemarker.compile.jsp1"/>
+@@ -509,7 +509,7 @@
+ </target>
+
+ <target name="compile-jsp2">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.jsp2.classpath"/>
+ <patternset refid="freemarker.compile.jsp2"/>
+@@ -517,7 +517,7 @@
+ </target>
+
+ <target name="compile-rhino" if="rhino.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.rhino"/>
+@@ -525,7 +525,7 @@
+ </target>
+
+ <target name="compile-dom4j" if="dom4j.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.dom4j"/>
+@@ -533,7 +533,7 @@
+ </target>
+
+ <target name="compile-jaxen" if="jaxen.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.jaxen"/>
+@@ -541,7 +541,7 @@
+ </target>
+
+ <target name="compile-jdom" if="jdom.available">
+- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
++ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.jdom"/>
+@@ -553,7 +553,7 @@
+ destdir="${build.classes.dir}"
+ debug="on"
+ optimize="off"
+- target="1.2" source="1.2">
++ target="1.3" source="1.3">
+ <src path="${src.dir}"/>
+ <classpath refid="compile.classpath"/>
+ <patternset refid="freemarker.compile.xalan"/>
Added: trunk/libfreemarker-java/debian/patches/javacc-home.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc-home.diff (rev 0)
+++ trunk/libfreemarker-java/debian/patches/javacc-home.diff 2007-12-16 12:26:53 UTC (rev 5055)
@@ -0,0 +1,13 @@
+Index: libfreemarker-java-2.3.11/build.xml
+===================================================================
+--- libfreemarker-java-2.3.11.orig/build.xml 2007-12-16 13:03:30.000000000 +0100
++++ libfreemarker-java-2.3.11/build.xml 2007-12-16 13:04:37.000000000 +0100
+@@ -376,7 +376,7 @@
+ <javacc
+ target="${src.dir}/freemarker/core/FMParser.jj"
+ outputdirectory="src/freemarker/core"
+- javacchome="lib"
++ javacchome="${javacc.home}"
+ />
+ <replace
+ file="src/freemarker/core/FMParserConstants.java"
Added: trunk/libfreemarker-java/debian/patches/no-downloads.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/no-downloads.diff (rev 0)
+++ trunk/libfreemarker-java/debian/patches/no-downloads.diff 2007-12-16 12:26:53 UTC (rev 5055)
@@ -0,0 +1,36 @@
+Index: libfreemarker-java-2.3.11/build.xml
+===================================================================
+--- libfreemarker-java-2.3.11.orig/build.xml 2007-12-16 12:54:15.000000000 +0100
++++ libfreemarker-java-2.3.11/build.xml 2007-12-16 12:54:27.000000000 +0100
+@@ -286,31 +286,6 @@
+ </target>
+
+ <target name="init">
+- <condition property="all.libs.present">
+- <and>
+- <available file="lib/README.txt"/>
+- <available file="lib/ant.jar"/>
+- <available file="lib/dom4j.jar"/>
+- <available file="lib/emma.jar"/>
+- <available file="lib/emma_ant.jar"/>
+- <available file="lib/javacc.jar"/>
+- <available file="lib/jaxen.jar"/>
+- <available file="lib/jdom.jar"/>
+- <available file="lib/js.jar"/>
+- <available file="lib/junit.jar"/>
+- <available file="lib/jython.jar"/>
+- <available file="lib/log4j.jar"/>
+- <available file="lib/logkit.jar"/>
+- <available file="lib/rt122.jar"/>
+- <available file="lib/saxpath.jar"/>
+- <available file="lib/servlet.jar"/>
+- <available file="lib/struts.jar"/>
+- <available file="lib/jsp-api-1.2.jar"/>
+- <available file="lib/jsp-api-2.0.jar"/>
+- <available file="lib/jsp-api-2.1.jar"/>
+- <available file="lib/xalan.jar"/>
+- </and>
+- </condition>
+ <antcall target="fetchlibs"/>
+ <available
+ property="log4j.available"
Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2007-12-16 11:07:22 UTC (rev 5054)
+++ trunk/libfreemarker-java/debian/patches/series 2007-12-16 12:26:53 UTC (rev 5055)
@@ -1,2 +1,4 @@
class_name.diff
java-version.diff
+no-downloads.diff
+javacc-home.diff
More information about the pkg-java-commits
mailing list