[pkg-java] r14997 - in trunk/libfreemarker-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Sep 22 12:22:51 UTC 2011
Author: drazzib
Date: 2011-09-22 12:22:50 +0000 (Thu, 22 Sep 2011)
New Revision: 14997
Modified:
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/control
trunk/libfreemarker-java/debian/copyright
trunk/libfreemarker-java/debian/libfreemarker-java-doc.install
trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
trunk/libfreemarker-java/debian/patches/disable-jython-extension.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/pom.xml
trunk/libfreemarker-java/debian/rules
Log:
* New upstream version:
- Refresh all patches.
* Drop Depends and B-D on libexcalibur-logkit-java and liblog4j1.2-java:
not used anymore.
* Add Depends and B-D on libslf4j-java and libcommons-logging-java.
* Wrap and sort Build-Depends and Depends.
* d/copyright: Use DEP-5 format.
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/changelog 2011-09-22 12:22:50 UTC (rev 14997)
@@ -1,11 +1,18 @@
-libfreemarker-java (2.3.16-4) UNRELEASED; urgency=low
+libfreemarker-java (2.3.18-1) unstable; urgency=low
+ * New upstream version:
+ - Refresh all patches.
* Bump Standards-Version to 3.9.2: no changes needed.
* Drop dependency on JRE package since it's a library.
* B-D and Depends on librhino-java and librhino-doc instead of
rhino and rhino-doc.
+ * Drop Depends and B-D on libexcalibur-logkit-java and liblog4j1.2-java:
+ not used anymore.
+ * Add Depends and B-D on libslf4j-java and libcommons-logging-java.
+ * Wrap and sort Build-Depends and Depends.
+ * d/copyright: Use DEP-5 format.
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 25 May 2011 23:27:25 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 22 Sep 2011 13:59:10 +0200
libfreemarker-java (2.3.16-3) unstable; urgency=low
Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/control 2011-09-22 12:22:50 UTC (rev 14997)
@@ -2,16 +2,38 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: ant-optional, libservlet2.5-java,
- javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom1-java,
- liblog4j1.2-java, libexcalibur-logkit-java, libxerces2-java, librhino-java,
- libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc,
- libdom4j-java-doc, librhino-java-doc, jython-doc, liblog4j1.2-java-doc,
- libjaxen-java-doc, libjdom1-java-doc, libxerces2-java-doc,
- libcommons-jxpath-java-doc, libxalan2-java-doc
+Uploaders: Varun Hiremath <varun at debian.org>,
+ Torsten Werner <twerner at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ default-jdk-doc,
+ javacc,
+ junit,
+ jython,
+ jython-doc,
+ libcommons-jxpath-java,
+ libcommons-jxpath-java-doc,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libdom4j-java,
+ libdom4j-java-doc,
+ libjaxen-java,
+ libjaxen-java-doc,
+ libjdom1-java,
+ libjdom1-java-doc,
+ librhino-java,
+ librhino-java-doc,
+ libservlet2.5-java,
+ libslf4j-java,
+ libxalan2-java,
+ libxalan2-java-doc,
+ libxerces2-java,
+ libxerces2-java-doc,
+ maven-repo-helper
Standards-Version: 3.9.2
Homepage: http://www.freemarker.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
@@ -19,11 +41,17 @@
Package: libfreemarker-java
Architecture: all
-Depends: libservlet2.5-java,
+Depends: libcommons-logging-java,
+ libservlet2.5-java,
+ libslf4j-java,
${misc:Depends}
-Suggests: jython, librhino-java, libjdom1-java, libdom4j-java, libjaxen-java,
- libxalan2-java, libexcalibur-logkit-java
-Description: a template engine written in Java
+Suggests: jython,
+ libdom4j-java,
+ libjaxen-java,
+ libjdom1-java,
+ librhino-java,
+ libxalan2-java
+Description: template engine written in Java
FreeMarker is a "template engine"; a generic tool to generate text output
(anything from HTML to autogenerated source code) based on templates. It's a
Java package, a class library for Java programmers. It's not an application
@@ -47,17 +75,17 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: default-jdk-doc,
- jython-doc,
- libcommons-jxpath-java,
- libjdom1-java-doc,
- libdom4j-java-doc,
- libjaxen-java-doc,
- liblog4j1.2-java-doc,
- libxalan2-java-doc,
- libxerces2-java-doc,
- librhino-java-doc
+ jython-doc,
+ libcommons-jxpath-java,
+ libdom4j-java-doc,
+ libjaxen-java-doc,
+ libjdom1-java-doc,
+ liblog4j1.2-java-doc,
+ librhino-java-doc,
+ libxalan2-java-doc,
+ libxerces2-java-doc
Suggests: libfreemarker-java
-Description: a template engine written in Java (documentation)
+Description: template engine written in Java (documentation)
FreeMarker is a "template engine"; a generic tool to generate text output
(anything from HTML to autogenerated source code) based on templates. It's a
Java package, a class library for Java programmers. It's not an application
Modified: trunk/libfreemarker-java/debian/copyright
===================================================================
--- trunk/libfreemarker-java/debian/copyright 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/copyright 2011-09-22 12:22:50 UTC (rev 14997)
@@ -1,36 +1,40 @@
-This package was debianized by Torsten Werner <twerner at debian.org> on
-Sat Jun 2 19:54:42 CEST 2007.
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: FreeMarker
+Upstream-Contact: The Visigoth Software Society
+Source: http://sourceforge.net/project/showfiles.php?group_id=794&package_id=787
-It was downloaded from
-<http://sourceforge.net/project/showfiles.php?group_id=794&package_id=787>.
+Files: *
+Copyright: Copyright 2003 The Visigoth Software Society. All rights reserved.
+License: BSD-4-clause
-Upstream Authors: The Visigoth Software Society
+Files: debian/*
+Copyright: Copyright 2007, Torsten Werner <twerner at debian.org>
+Copyright: Copyright 2009-2011, Damien Raude-Morvan <drazzib at debian.org>
+License: BSD-4-clause
-Copyright 2003 The Visigoth Software Society. All rights reserved.
-
-License:
+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.
-
+ 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.
-
+ 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 visigoths at visigoths.org.
-
+ project contributors may be used to endorse or promote products derived
+ from this software without prior written permission. For written
+ permission, please contact visigoths at 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.
-
+ "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
@@ -41,9 +45,3 @@
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.
-
-
-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.install
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java-doc.install 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/libfreemarker-java-doc.install 2011-09-22 12:22:50 UTC (rev 14997)
@@ -1,2 +1,2 @@
+README.txt /usr/share/doc/libfreemarker-java/
build/api /usr/share/doc/libfreemarker-java/
-README.txt /usr/share/doc/libfreemarker-java/
Modified: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2011-09-22 12:22:50 UTC (rev 14997)
@@ -1,9 +1,11 @@
Description: Link the javadoc against the system javadoc.
Author: Niels Thykier <niels at thykier.net>
---- a/build.xml 2010-03-27 00:15:23.231497299 +0100
-+++ b/build.xml 2010-03-27 00:15:01.651506989 +0100
-@@ -407,6 +407,17 @@
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -446,6 +446,17 @@
windowtitle="FreeMarker ${version} API"
classpathref="compile.classpath.javadoc"
use="${javadoc.use}">
Modified: trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch 2011-09-22 12:22:50 UTC (rev 14997)
@@ -13,23 +13,23 @@
src/freemarker/ext/jython/JythonModelCache.java | 45 +----------------------
3 files changed, 3 insertions(+), 47 deletions(-)
-diff --git a/build.xml b/build.xml
-index 25c5328..bb5631a 100644
+Index: b/build.xml
+===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -513,7 +513,6 @@ Version: $Id: build.xml,v 1.138.2.4 2006/12/27 16:11:23 szegedia Exp $
- <antcall target="compile-logkit"/>
+@@ -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"/>
-diff --git a/src/freemarker/ext/jython/JythonHashModel.java b/src/freemarker/ext/jython/JythonHashModel.java
-index f6ea9d3..1104bb8 100644
+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 @@ implements
+@@ -137,7 +137,7 @@
{
throw new TemplateModelException(e);
}
@@ -38,7 +38,7 @@
}
/**
-@@ -157,6 +157,6 @@ implements
+@@ -157,6 +157,6 @@
{
throw new TemplateModelException(e);
}
@@ -46,11 +46,11 @@
+ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute");
}
}
-diff --git a/src/freemarker/ext/jython/JythonModelCache.java b/src/freemarker/ext/jython/JythonModelCache.java
-index 9d29ca5..e506e9f 100644
+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.Py;
+@@ -10,7 +10,6 @@
import org.python.core.PyDictionary;
import org.python.core.PyFloat;
import org.python.core.PyInteger;
@@ -58,7 +58,7 @@
import org.python.core.PyLong;
import org.python.core.PyNone;
import org.python.core.PyObject;
-@@ -35,48 +34,6 @@ class JythonModelCache extends ModelCache
+@@ -35,48 +34,6 @@
}
protected TemplateModel create(Object obj) {
@@ -108,6 +108,3 @@
+ throw new RuntimeException("Jython support is broken!");
}
}
---
-1.7.1
-
Modified: trunk/libfreemarker-java/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/patches/javacc.diff 2011-09-22 12:22:50 UTC (rev 14997)
@@ -2,9 +2,11 @@
Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-09-27
+Index: b/build.xml
+===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -427,7 +427,6 @@
+@@ -466,7 +466,6 @@
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/"
@@ -12,7 +14,7 @@
/>
<!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ -->
-@@ -435,7 +434,7 @@
+@@ -474,7 +473,7 @@
<javacc:generate
target="${src.dir}/freemarker/core/FMParser.jj"
outputdirectory="src/freemarker/core"
Modified: trunk/libfreemarker-java/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2011-09-22 12:22:50 UTC (rev 14997)
@@ -3,6 +3,20 @@
Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-09-27
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -162,6 +162,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"/>
+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 @@
@@ -13,7 +27,7 @@
}
}
-@@ -1566,12 +1565,6 @@
+@@ -1674,13 +1673,7 @@
private static boolean isJavaRebelAvailable() {
@@ -25,14 +39,5 @@
return false;
- }
}
- }
---- a/build.xml
-+++ b/build.xml
-@@ -151,6 +151,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/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/patches/jsp_api.diff 2011-09-22 12:22:50 UTC (rev 14997)
@@ -2,9 +2,11 @@
Forwarded: no
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-09-27
+Index: b/build.xml
+===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -83,8 +83,6 @@
+@@ -89,8 +89,6 @@
</path>
<path id="compile.jsp1.classpath">
@@ -13,16 +15,16 @@
</path>
<path id="compile.jsp2.classpath">
-@@ -223,7 +221,6 @@
- </patternset>
+@@ -244,7 +242,6 @@
<patternset id="freemarker.compile.jsp1">
+ <include name="freemarker/ext/jsp/TaglibFactory.java"/>
- <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
</patternset>
<patternset id="freemarker.compile.jsp2">
-@@ -505,8 +502,6 @@
- <antcall target="compile-logkit"/>
+@@ -546,8 +543,6 @@
+ <antcall target="compile-commons-logging"/>
<antcall target="compile-jdk14"/>
<antcall target="compile-jdk15"/>
- <antcall target="compile-jsp1"/>
Modified: trunk/libfreemarker-java/debian/pom.xml
===================================================================
--- trunk/libfreemarker-java/debian/pom.xml 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/pom.xml 2011-09-22 12:22:50 UTC (rev 14997)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.16</version>
+ <version>2.3.18</version>
<packaging>jar</packaging>
<name>FreeMarker</name>
<description>
Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2011-09-22 12:20:48 UTC (rev 14996)
+++ trunk/libfreemarker-java/debian/rules 2011-09-22 12:22:50 UTC (rev 14997)
@@ -3,8 +3,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-POM_VERSION := 2.3.16
-MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
+POM_VERSION := 2.3.18
+MAVEN_REPO := http://repo1.maven.org/maven2/
JAVA_HOME := /usr/lib/jvm/default-java
@@ -12,7 +12,7 @@
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 excalibur-logkit xercesImpl jsp-api xalan2 commons-jxpath ant-junit
+ jython commons-logging slf4j-api xercesImpl xalan2 commons-jxpath ant-junit
install/libfreemarker-java::
mh_installpoms -plibfreemarker-java
@@ -22,5 +22,5 @@
uscan --force-download --rename
get-orig-pom:
- wget -O debian/pom.xml $(MAVEN_REPO)/org/freemarker/freemarker/$(POM_VERSION)/freemarker-$(POM_VERSION).pom
+ wget --user-agent="Mozilla/5.0" -O debian/pom.xml $(MAVEN_REPO)/org/freemarker/freemarker/$(POM_VERSION)/freemarker-$(POM_VERSION).pom
perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/pom.xml
More information about the pkg-java-commits
mailing list