Author: ebourg-guest Date: 2013-05-06 23:15:35 +0000 (Mon, 06 May 2013) New Revision: 16598
Added: trunk/libfreemarker-java/debian/patches/fix-classpath.patch Removed: trunk/libfreemarker-java/debian/patches/class_name.diff trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch Modified: trunk/libfreemarker-java/debian/changelog trunk/libfreemarker-java/debian/control trunk/libfreemarker-java/debian/copyright trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch trunk/libfreemarker-java/debian/patches/javacc.diff trunk/libfreemarker-java/debian/patches/javarebel.diff trunk/libfreemarker-java/debian/patches/jsp_api.diff trunk/libfreemarker-java/debian/patches/series trunk/libfreemarker-java/debian/pom.xml trunk/libfreemarker-java/debian/rules Log: New upstream release (2.3.19) Refreshed the patches Re-enabled Jython support (compilation issue fixed upstream) Updated Standards-Version to 3.9.4: no changes needed. debian/copyright: Updated to the Copyright Format 1.0 debian/rules: Improved the clean target to allow rebuilds Modified: trunk/libfreemarker-java/debian/changelog =================================================================== --- trunk/libfreemarker-java/debian/changelog 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/changelog 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,3 +1,15 @@ +libfreemarker-java (2.3.19-1) unstable; urgency=low + + * Team upload. + * New upstream release + * Refreshed the patches + * Re-enabled Jython support (compilation issue fixed upstream) + * Updated Standards-Version to 3.9.4: no changes needed. + * debian/copyright: Updated to the Copyright Format 1.0 + * debian/rules: Improved the clean target to allow rebuilds + + -- Emmanuel Bourg <ebo...@apache.org> Tue, 07 May 2013 01:10:31 +0200 + libfreemarker-java (2.3.18-1) unstable; urgency=low * New upstream version: Modified: trunk/libfreemarker-java/debian/control =================================================================== --- trunk/libfreemarker-java/debian/control 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/control 2013-05-06 23:15:35 UTC (rev 16598) @@ -4,7 +4,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner <twer...@debian.org>, - Damien Raude-Morvan <draz...@debian.org> + Damien Raude-Morvan <draz...@debian.org>, + Emmanuel Bourg <ebo...@apache.org> Build-Depends: ant, ant-optional, cdbs, @@ -34,8 +35,8 @@ libxerces2-java, libxerces2-java-doc, maven-repo-helper -Standards-Version: 3.9.2 -Homepage: http://www.freemarker.org/ +Standards-Version: 3.9.4 +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 Modified: trunk/libfreemarker-java/debian/copyright =================================================================== --- trunk/libfreemarker-java/debian/copyright 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/copyright 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,47 +1,47 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: FreeMarker Upstream-Contact: The Visigoth Software Society -Source: http://sourceforge.net/project/showfiles.php?group_id=794&package_id=787 +Source: http://freemarker.sourceforge.net/ Files: * Copyright: Copyright 2003 The Visigoth Software Society. All rights reserved. License: BSD-4-clause Files: debian/* -Copyright: Copyright 2007, Torsten Werner <twer...@debian.org> -Copyright: Copyright 2009-2011, Damien Raude-Morvan <draz...@debian.org> +Copyright: 2007, Torsten Werner <twer...@debian.org> + 2009-2011, Damien Raude-Morvan <draz...@debian.org> License: BSD-4-clause License: BSD-4-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - 2. The end-user documentation included with the redistribution, if any, must - include the following acknowlegement: - "This product includes software developed by the - Visigoth Software Society (http://www.visigoths.org/)." - Alternately, this acknowlegement may appear in the software itself, if and - wherever such third-party acknowlegements normally appear. - . - 3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the - project contributors may be used to endorse or promote products derived - from this software without prior written permission. For written - permission, please contact visigo...@visigoths.org. - . - 4. Products derived from this software may not be called "FreeMarker" or - "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names - without prior written permission of the Visigoth Software Society. - . - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - VISIGOTH SOFTWARE SOCIETY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. The end-user documentation included with the redistribution, if any, must + include the following acknowlegement: + "This product includes software developed by the + Visigoth Software Society (http://www.visigoths.org/)." + Alternately, this acknowlegement may appear in the software itself, if and + wherever such third-party acknowlegements normally appear. + . + 3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the + project contributors may be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact visigo...@visigoths.org. + . + 4. Products derived from this software may not be called "FreeMarker" or + "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names + without prior written permission of the Visigoth Software Society. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + VISIGOTH SOFTWARE SOCIETY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: trunk/libfreemarker-java/debian/patches/class_name.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/class_name.diff 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/class_name.diff 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,19 +0,0 @@ ---- a/src/freemarker/ext/jython/JythonHashModel.java -+++ b/src/freemarker/ext/jython/JythonHashModel.java -@@ -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()); - } - - /** -@@ -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("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType().getFullName()); - } - } Modified: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch =================================================================== --- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,11 +1,9 @@ Description: Link the javadoc against the system javadoc. Author: Niels Thykier <ni...@thykier.net> -Index: b/build.xml -=================================================================== --- a/build.xml +++ b/build.xml -@@ -446,6 +446,17 @@ +@@ -461,6 +461,17 @@ windowtitle="FreeMarker ${version} API" classpathref="compile.classpath.javadoc" use="${javadoc.use}"> Deleted: trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch =================================================================== --- trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,110 +0,0 @@ -From ecec63b55bf12bef19b2b316071d065b068746ea Mon Sep 17 00:00:00 2001 -From: Torsten Werner <twer...@debian.org> -Date: Wed, 4 Aug 2010 03:02:05 +0200 -Subject: [PATCH] disable jython extension - -Freemarker 2.3.16 fails to build against jython 2.5 because the PyJavaInstance -class has been removed. See -<https://sourceforge.net/tracker/index.php?func=detail&aid=2831150&group_id=794&atid=100794> -for the upstream bug. ---- - build.xml | 1 - - src/freemarker/ext/jython/JythonHashModel.java | 4 +- - src/freemarker/ext/jython/JythonModelCache.java | 45 +---------------------- - 3 files changed, 3 insertions(+), 47 deletions(-) - -Index: b/build.xml -=================================================================== ---- a/build.xml -+++ b/build.xml -@@ -554,7 +554,6 @@ - <antcall target="compile-commons-logging"/> - <antcall target="compile-jdk14"/> - <antcall target="compile-jdk15"/> -- <antcall target="compile-jython"/> - <antcall target="compile-dom4j"/> - <antcall target="compile-jdom"/> - <antcall target="compile-xalan"/> -Index: b/src/freemarker/ext/jython/JythonHashModel.java -=================================================================== ---- a/src/freemarker/ext/jython/JythonHashModel.java -+++ b/src/freemarker/ext/jython/JythonHashModel.java -@@ -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.getType().getFullName()); -+ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute"); - } - - /** -@@ -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.getType().getFullName()); -+ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute"); - } - } -Index: b/src/freemarker/ext/jython/JythonModelCache.java -=================================================================== ---- a/src/freemarker/ext/jython/JythonModelCache.java -+++ b/src/freemarker/ext/jython/JythonModelCache.java -@@ -10,7 +10,6 @@ - import org.python.core.PyDictionary; - import org.python.core.PyFloat; - import org.python.core.PyInteger; --import org.python.core.PyJavaInstance; - import org.python.core.PyLong; - import org.python.core.PyNone; - import org.python.core.PyObject; -@@ -35,48 +34,6 @@ - } - - protected TemplateModel create(Object obj) { -- boolean asHash = false; -- boolean asSequence = false; -- if(obj instanceof PyJavaInstance) { -- Object jobj = ((PyJavaInstance)obj).__tojava__(java.lang.Object.class); -- // FreeMarker-aware, Jython-wrapped Java objects are left intact -- if(jobj instanceof TemplateModel) { -- return (TemplateModel)jobj; -- } -- if(jobj instanceof Map) { -- asHash = true; -- } -- if (jobj instanceof Date) { -- return new DateModel((Date) jobj, BeansWrapper.getDefaultInstance()); -- } -- else if(jobj instanceof Collection) { -- asSequence = true; -- // FIXME: This is an ugly hack, but AFAIK, there's no better -- // solution if we want to have Sets and other non-List -- // collections managed by this layer, as Jython quite clearly -- // doesn't support sets. -- if(!(jobj instanceof List)) { -- obj = new ArrayList((Collection)jobj); -- } -- } -- } -- -- // If it's not a PyObject, first make a PyObject out of it. -- if(!(obj instanceof PyObject)) { -- obj = Py.java2py(obj); -- } -- if(asHash || obj instanceof PyDictionary || obj instanceof PyStringMap) { -- return JythonHashModel.FACTORY.create(obj, wrapper); -- } -- if(asSequence || obj instanceof PySequence) { -- return JythonSequenceModel.FACTORY.create(obj, wrapper); -- } -- if(obj instanceof PyInteger || obj instanceof PyLong || obj instanceof PyFloat) { -- return JythonNumberModel.FACTORY.create(obj, wrapper); -- } -- if(obj instanceof PyNone) { -- return null; -- } -- return JythonModel.FACTORY.create(obj, wrapper); -+ throw new RuntimeException("Jython support is broken!"); - } - } Added: trunk/libfreemarker-java/debian/patches/fix-classpath.patch =================================================================== --- trunk/libfreemarker-java/debian/patches/fix-classpath.patch (rev 0) +++ trunk/libfreemarker-java/debian/patches/fix-classpath.patch 2013-05-06 23:15:35 UTC (rev 16598) @@ -0,0 +1,24 @@ +Description: This patch sets the classpath for building the javadoc and compiling + the tests. For some reason the classpath set by CDBS is ignored, please remove + this patch if you figure out why. +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -459,7 +459,7 @@ + sourcepath="${src.dir}" + version="true" + windowtitle="FreeMarker ${version} API" +- classpathref="compile.classpath.javadoc" ++ classpathref="compile.classpath" + use="${javadoc.use}"> + <link href="/usr/share/doc/default-jdk-doc/api/" /> + <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" /> +@@ -789,6 +789,7 @@ + + <javac deprecation="on" destdir="${testcase.dir}" debug="on" optimize="off" includeantruntime="false"> + <src path="${src.dir}"/> ++ <classpath refid="compile.classpath"/> + <classpath refid="compile.classpath.testcases"/> + <patternset refid="freemarker.compile.testcases"/> + </javac> Modified: trunk/libfreemarker-java/debian/patches/javacc.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/javacc.diff 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/javacc.diff 2013-05-06 23:15:35 UTC (rev 16598) @@ -2,19 +2,15 @@ Forwarded: no Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2009-09-27 -Index: b/build.xml -=================================================================== --- a/build.xml +++ b/build.xml -@@ -466,7 +466,6 @@ +@@ -481,13 +481,12 @@ description="Build the JavaCC parser from its grammar file"> <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" uri="http://javacc.dev.java.net/" - classpath="lib/javacc.jar" /> - <!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ --> -@@ -474,7 +473,7 @@ <javacc:generate target="${src.dir}/freemarker/core/FMParser.jj" outputdirectory="src/freemarker/core" @@ -23,3 +19,12 @@ /> <replace file="src/freemarker/core/FMParser.java" +@@ -507,7 +506,7 @@ + <replace + file="src/freemarker/core/Token.java" + token="public class Token" +- value="class Token implements java.io.Serializable" ++ value="class Token" + /> + <replace + file="src/freemarker/core/SimpleCharStream.java" Modified: trunk/libfreemarker-java/debian/patches/javarebel.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/javarebel.diff 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2013-05-06 23:15:35 UTC (rev 16598) @@ -3,11 +3,9 @@ Forwarded: no Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2009-09-27 -Index: b/build.xml -=================================================================== --- a/build.xml +++ b/build.xml -@@ -162,6 +162,7 @@ +@@ -158,6 +158,7 @@ <exclude name="freemarker/core/RegexBuiltins.java"/> <exclude name="freemarker/ext/ant/**"/> <exclude name="freemarker/ext/beans/EnumModels.java"/> @@ -15,8 +13,6 @@ <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/> <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/> <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/> -Index: b/src/freemarker/ext/beans/BeansWrapper.java -=================================================================== --- a/src/freemarker/ext/beans/BeansWrapper.java +++ b/src/freemarker/ext/beans/BeansWrapper.java @@ -232,7 +232,6 @@ @@ -27,7 +23,7 @@ } } -@@ -1674,13 +1673,7 @@ +@@ -1672,13 +1671,7 @@ private static boolean isJavaRebelAvailable() { Modified: trunk/libfreemarker-java/debian/patches/jsp_api.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/jsp_api.diff 2013-05-06 23:15:35 UTC (rev 16598) @@ -2,20 +2,18 @@ Forwarded: no Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2009-09-27 -Index: b/build.xml -=================================================================== --- a/build.xml +++ b/build.xml @@ -89,8 +89,6 @@ </path> <path id="compile.jsp1.classpath"> -- <path refid="compile.nojsp.classpath"/> +- <path refid="compile.nomultiversion.classpath"/> - <pathelement path="${lib.jsp12}"/> </path> <path id="compile.jsp2.classpath"> -@@ -244,7 +242,6 @@ +@@ -250,7 +248,6 @@ <patternset id="freemarker.compile.jsp1"> <include name="freemarker/ext/jsp/TaglibFactory.java"/> @@ -23,12 +21,12 @@ </patternset> <patternset id="freemarker.compile.jsp2"> -@@ -546,8 +543,6 @@ +@@ -561,8 +558,6 @@ <antcall target="compile-commons-logging"/> <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"/> + <antcall target="compile-jython20"/> + <antcall target="compile-jython22"/> + <antcall target="compile-jython25"/> Modified: trunk/libfreemarker-java/debian/patches/series =================================================================== --- trunk/libfreemarker-java/debian/patches/series 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/patches/series 2013-05-06 23:15:35 UTC (rev 16598) @@ -1,8 +1,7 @@ -class_name.diff javarebel.diff jdom1.diff javacc.diff jsp_api.diff def-jdk-doc.patch -disable-jython-extension.patch dtd_location.diff +fix-classpath.patch Modified: trunk/libfreemarker-java/debian/pom.xml =================================================================== --- trunk/libfreemarker-java/debian/pom.xml 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/pom.xml 2013-05-06 23:15:35 UTC (rev 16598) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.18</version> + <version>2.3.19</version> <packaging>jar</packaging> <name>FreeMarker</name> <description> Modified: trunk/libfreemarker-java/debian/rules =================================================================== --- trunk/libfreemarker-java/debian/rules 2013-05-06 12:55:14 UTC (rev 16597) +++ trunk/libfreemarker-java/debian/rules 2013-05-06 23:15:35 UTC (rev 16598) @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -POM_VERSION := 2.3.18 +POM_VERSION := 2.3.19 MAVEN_REPO := http://repo1.maven.org/maven2/ JAVA_HOME := /usr/lib/jvm/default-java @@ -18,6 +18,9 @@ mh_installpoms -plibfreemarker-java mh_installjar -plibfreemarker-java -l debian/pom.xml lib/freemarker.jar +clean:: + mh_clean + get-orig-source: uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits