[pkg-java] r11247 - in trunk/libfreemarker-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Dec 12 12:56:38 UTC 2009
Author: drazzib
Date: 2009-12-12 12:56:37 +0000 (Sat, 12 Dec 2009)
New Revision: 11247
Added:
trunk/libfreemarker-java/debian/libfreemarker-java.poms
trunk/libfreemarker-java/debian/pom.xml
Modified:
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/compat
trunk/libfreemarker-java/debian/control
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/rules
Log:
* New upstream release
- refresh patches: javarebel.diff, javacc.diff and jsp_api.diff
* Bump debhelper version to >= 7
* libfreemarker-java-doc:
- remove Depends ${shlib:Depends}
- remove Depends on java runtimes
- add Suggests on libfreemarker-java
* Maven POMs:
- debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
- debian/rules: use mh_installpoms and mh_installjar
to install the POM and the jar to the Maven repository
- debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
- debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
release.
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/changelog 2009-12-12 12:56:37 UTC (rev 11247)
@@ -1,3 +1,22 @@
+libfreemarker-java (2.3.16-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - refresh patches: javarebel.diff, javacc.diff and jsp_api.diff
+ * Bump debhelper version to >= 7
+ * libfreemarker-java-doc:
+ - remove Depends ${shlib:Depends}
+ - remove Depends on java runtimes
+ - add Suggests on libfreemarker-java
+ * Maven POMs:
+ - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
+ - debian/rules: use mh_installpoms and mh_installjar
+ to install the POM and the jar to the Maven repository
+ - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
+ - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
+ release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 12 Dec 2009 13:56:24 +0100
+
libfreemarker-java (2.3.15-1) unstable; urgency=low
[ Torsten Werner ]
Modified: trunk/libfreemarker-java/debian/compat
===================================================================
--- trunk/libfreemarker-java/debian/compat 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/compat 2009-12-12 12:56:37 UTC (rev 11247)
@@ -1 +1 @@
-5
+7
Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/control 2009-12-12 12:56:37 UTC (rev 11247)
@@ -4,11 +4,11 @@
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>,
Paul Cager <paul-debian at home.paulcager.org>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, default-jdk
+Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk
Build-Depends-Indep: ant, ant-optional, libservlet2.5-java,
javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom1-java,
liblog4j1.2-java, liblogkit-java, libxerces2-java, rhino,
- libcommons-jxpath-java, libxalan2-java
+ libcommons-jxpath-java, libxalan2-java, maven-repo-helper
Standards-Version: 3.8.3
Homepage: http://www.freemarker.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
@@ -16,8 +16,7 @@
Package: libfreemarker-java
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java1-runtime | java2-runtime
-Suggests: libfreemarker-java-doc
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime
Description: a 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
@@ -40,7 +39,8 @@
Package: libfreemarker-java-doc
Section: doc
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
+Suggests: libfreemarker-java
Description: a 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
@@ -60,4 +60,4 @@
page author is the same person, since it helps to keep the application clear
and easily maintainable.
.
- This package contains the documentation.
+ This package contains the documentation of libfreemarker-java.
Added: trunk/libfreemarker-java/debian/libfreemarker-java.poms
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java.poms (rev 0)
+++ trunk/libfreemarker-java/debian/libfreemarker-java.poms 2009-12-12 12:56:37 UTC (rev 11247)
@@ -0,0 +1 @@
+debian/pom.xml
Modified: trunk/libfreemarker-java/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/patches/javacc.diff 2009-12-12 12:56:37 UTC (rev 11247)
@@ -4,17 +4,20 @@
Last-Update: 2009-09-27
--- a/build.xml
+++ b/build.xml
-@@ -410,11 +410,11 @@
+@@ -427,7 +427,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/"
+- classpath="lib/javacc.jar"
+ />
+
<!-- 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
+@@ -435,7 +434,7 @@
+ <javacc:generate
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"
+ <replace
+ file="src/freemarker/core/FMParser.java"
Modified: trunk/libfreemarker-java/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2009-12-12 12:56:37 UTC (rev 11247)
@@ -13,7 +13,7 @@
}
}
-@@ -1559,12 +1558,6 @@
+@@ -1566,12 +1565,6 @@
private static boolean isJavaRebelAvailable() {
@@ -28,7 +28,7 @@
}
--- a/build.xml
+++ b/build.xml
-@@ -147,6 +147,7 @@
+@@ -151,6 +151,7 @@
<exclude name="freemarker/core/RegexBuiltins.java"/>
<exclude name="freemarker/ext/ant/**"/>
<exclude name="freemarker/ext/beans/EnumModels.java"/>
Modified: trunk/libfreemarker-java/debian/patches/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/patches/jsp_api.diff 2009-12-12 12:56:37 UTC (rev 11247)
@@ -4,7 +4,7 @@
Last-Update: 2009-09-27
--- a/build.xml
+++ b/build.xml
-@@ -79,8 +79,6 @@
+@@ -83,8 +83,6 @@
</path>
<path id="compile.jsp1.classpath">
@@ -13,7 +13,7 @@
</path>
<path id="compile.jsp2.classpath">
-@@ -219,7 +217,6 @@
+@@ -223,7 +221,6 @@
</patternset>
<patternset id="freemarker.compile.jsp1">
@@ -21,7 +21,7 @@
</patternset>
<patternset id="freemarker.compile.jsp2">
-@@ -480,8 +477,6 @@
+@@ -505,8 +502,6 @@
<antcall target="compile-logkit"/>
<antcall target="compile-jdk14"/>
<antcall target="compile-jdk15"/>
Added: trunk/libfreemarker-java/debian/pom.xml
===================================================================
--- trunk/libfreemarker-java/debian/pom.xml (rev 0)
+++ trunk/libfreemarker-java/debian/pom.xml 2009-12-12 12:56:37 UTC (rev 11247)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.16</version>
+ <packaging>jar</packaging>
+ <name>FreeMarker</name>
+ <description>
+ FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
+ </description>
+ <url>http://freemarker.org</url>
+ <licenses>
+ <license>
+ <name>BSD-style license</name>
+ <url>http://freemarker.org/LICENSE.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://freemarker.svn.sourceforge.net/viewvc/freemarker/</url>
+ <connection>scm:svn:https://freemarker.svn.sourceforge.net/svnroot/freemarker</connection>
+ </scm>
+ <dependencies>
+ <!-- no required dependencies -->
+ </dependencies>
+ </project>
+
\ No newline at end of file
Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2009-12-12 12:55:19 UTC (rev 11246)
+++ trunk/libfreemarker-java/debian/rules 2009-12-12 12:56:37 UTC (rev 11247)
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+POM_VERSION := 2.3.16
+MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
+
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := javacc jar javadoc
@@ -13,11 +16,12 @@
jython log4j-1.2 logkit xercesImpl jsp-api xalan2 commons-jxpath ant-junit
install/libfreemarker-java::
- 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 \
- /usr/share/java/freemarker.jar
+ mh_installpoms -plibfreemarker-java
+ mh_installjar -plibfreemarker-java -l debian/pom.xml lib/freemarker.jar
get-orig-source:
uscan --force-download --rename
+
+get-orig-pom:
+ wget -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