Author: drazzib Date: 2009-09-27 08:50:37 +0000 (Sun, 27 Sep 2009) New Revision: 10655
Added: trunk/libfreemarker-java/debian/README.source trunk/libfreemarker-java/debian/patches/javarebel.diff trunk/libfreemarker-java/debian/patches/jdom1.diff Removed: trunk/libfreemarker-java/debian/README.Debian-source Modified: trunk/libfreemarker-java/debian/build.xml trunk/libfreemarker-java/debian/changelog trunk/libfreemarker-java/debian/control trunk/libfreemarker-java/debian/patches/class_name.diff trunk/libfreemarker-java/debian/patches/series trunk/libfreemarker-java/debian/rules Log: * New patch javarebel.diff to disable JavaRebel * Add myself as Uploaders * Bump Standards-Version to 3.8.3: - Move libfreemarker-java to "java" section - Rename README.Debian-source to README.source * Use default-jdk/jre: - Depends on default-jre-headless - Build-Depends on default-jdk - Use /usr/lib/jvm/default-java as JAVA_HOME * JDOM 1.x: - Build-Depends libjdom1-java instead of libjdom0-java - New jdom1.diff patch to build with new JDOM API - Update DEB_JARS * Remove unneeded shlibs:Depends variable Deleted: trunk/libfreemarker-java/debian/README.Debian-source =================================================================== --- trunk/libfreemarker-java/debian/README.Debian-source 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/README.Debian-source 2009-09-27 08:50:37 UTC (rev 10655) @@ -1,13 +0,0 @@ -libfreemarker-java -================== - -The upstream supplied source package contains binary jar files and -pre-built documentation. Currently no clean source distribution -exists. Therefore, the upstream sources were modified to comply with -the Debian Free Software Guidelines. - -Use the rules/get-orig-source target to create the orig.tar.gz. -For more details on repackaging of upstream sources please see the -debian/orig-tar.sh file. - --- Varun Hiremath <[email protected]> Mon, 27 Aug 2007 19:02:53 +0530 Copied: trunk/libfreemarker-java/debian/README.source (from rev 10651, trunk/libfreemarker-java/debian/README.Debian-source) =================================================================== --- trunk/libfreemarker-java/debian/README.source (rev 0) +++ trunk/libfreemarker-java/debian/README.source 2009-09-27 08:50:37 UTC (rev 10655) @@ -0,0 +1,13 @@ +libfreemarker-java +================== + +The upstream supplied source package contains binary jar files and +pre-built documentation. Currently no clean source distribution +exists. Therefore, the upstream sources were modified to comply with +the Debian Free Software Guidelines. + +Use the rules/get-orig-source target to create the orig.tar.gz. +For more details on repackaging of upstream sources please see the +debian/orig-tar.sh file. + +-- Varun Hiremath <[email protected]> Mon, 27 Aug 2007 19:02:53 +0530 Modified: trunk/libfreemarker-java/debian/build.xml =================================================================== --- trunk/libfreemarker-java/debian/build.xml 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/build.xml 2009-09-27 08:50:37 UTC (rev 10655) @@ -40,11 +40,12 @@ <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"> + 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}"> Modified: trunk/libfreemarker-java/debian/changelog =================================================================== --- trunk/libfreemarker-java/debian/changelog 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/changelog 2009-09-27 08:50:37 UTC (rev 10655) @@ -1,10 +1,26 @@ -libfreemarker-java (2.3.15-1) experimental; urgency=low +libfreemarker-java (2.3.15-1) UNRELEASED; urgency=low - UNRELEASED (needs http://www.zeroturnaround.com/javarebel/) + [ Torsten Werner ] * New upstream release - -- Torsten Werner <[email protected]> Sun, 11 Jan 2009 23:44:14 +0100 + [ 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 + - Rename README.Debian-source to README.source + * Use default-jdk/jre: + - Depends on default-jre-headless + - Build-Depends on default-jdk + - Use /usr/lib/jvm/default-java as JAVA_HOME + * JDOM 1.x: + - Build-Depends libjdom1-java instead of libjdom0-java + - New jdom1.diff patch to build with new JDOM API + - Update DEB_JARS + * Remove unneeded shlibs:Depends variable + -- Damien Raude-Morvan <[email protected]> Sun, 27 Sep 2009 10:50:03 +0200 + libfreemarker-java (2.3.14-1) experimental; urgency=low * New upstream release Modified: trunk/libfreemarker-java/debian/control =================================================================== --- trunk/libfreemarker-java/debian/control 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/control 2009-09-27 08:50:37 UTC (rev 10655) @@ -1,21 +1,22 @@ Source: libfreemarker-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Paul Cager <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), quilt -Build-Depends-Indep: ant, ant-optional, libservlet2.5-java, java-gcj-compat-dev, - javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom0-java, +Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, + Paul Cager <[email protected]>, Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, debhelper (>= 5), 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 -Standards-Version: 3.8.0 +Standards-Version: 3.8.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 Package: libfreemarker-java Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime +Depends: ${misc:Depends}, default-jre-headless | java1-runtime | java2-runtime Suggests: libfreemarker-java-doc Description: a template engine written in Java FreeMarker is a "template engine"; a generic tool to generate text output Modified: trunk/libfreemarker-java/debian/patches/class_name.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/class_name.diff 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/patches/class_name.diff 2009-09-27 08:50:37 UTC (rev 10655) @@ -1,7 +1,5 @@ -Index: libfreemarker-java-2.3.11/src/freemarker/ext/jython/JythonHashModel.java -=================================================================== ---- 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 +--- a/src/freemarker/ext/jython/JythonHashModel.java ++++ b/src/freemarker/ext/jython/JythonHashModel.java @@ -137,7 +137,7 @@ { throw new TemplateModelException(e); Added: trunk/libfreemarker-java/debian/patches/javarebel.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/javarebel.diff (rev 0) +++ trunk/libfreemarker-java/debian/patches/javarebel.diff 2009-09-27 08:50:37 UTC (rev 10655) @@ -0,0 +1,26 @@ +Description: + Disable JavaRebelIntegration (no yet in Debian and non-free stuff) +Author: Damien Raude-Morvan <[email protected]> +--- a/src/freemarker/ext/beans/BeansWrapper.java ++++ b/src/freemarker/ext/beans/BeansWrapper.java +@@ -232,7 +232,6 @@ + */ + public BeansWrapper() { + if(javaRebelAvailable) { +- JavaRebelIntegration.registerWrapper(this); + } + } + +@@ -1559,12 +1558,6 @@ + + + private static boolean isJavaRebelAvailable() { +- try { +- JavaRebelIntegration.testAvailability(); +- return true; +- } +- catch(NoClassDefFoundError e) { + return false; +- } + } + } Added: trunk/libfreemarker-java/debian/patches/jdom1.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/jdom1.diff (rev 0) +++ trunk/libfreemarker-java/debian/patches/jdom1.diff 2009-09-27 08:50:37 UTC (rev 10655) @@ -0,0 +1,109 @@ +--- a/src/freemarker/ext/jdom/NodeListModel.java ++++ b/src/freemarker/ext/jdom/NodeListModel.java +@@ -734,7 +734,7 @@ + else if ("data".equals(localName)) + attr = new Attribute("data", pi.getData()); + else +- attr = new Attribute(localName, pi.getValue(localName)); ++ attr = new Attribute(localName, pi.getValue()); + } else if (node instanceof DocType) { + DocType doctype = (DocType)node; + if ("publicId".equals(localName)) +@@ -844,17 +844,17 @@ + private static final Element getParent(Object node) + { + if (node instanceof Element) +- return((Element)node).getParent(); ++ return((Element)node).getParentElement(); + else if (node instanceof Attribute) + return((Attribute)node).getParent(); + else if (node instanceof Text) +- return((Text)node).getParent(); ++ return((Text)node).getParentElement(); + else if (node instanceof ProcessingInstruction) +- return((ProcessingInstruction)node).getParent(); ++ return((ProcessingInstruction)node).getParentElement(); + else if (node instanceof Comment) +- return((Comment)node).getParent(); ++ return((Comment)node).getParentElement(); + else if (node instanceof EntityRef) +- return((EntityRef)node).getParent(); ++ return((EntityRef)node).getParentElement(); + else + // With 2.1 semantics it makes more sense to just return a null and let the core + // throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR) +@@ -878,7 +878,7 @@ + LinkedList list = new LinkedList(); + do { + list.addFirst(parent); +- parent = parent.getParent(); ++ parent = parent.getParentElement(); + } + while (parent != null); + return list; +@@ -894,7 +894,7 @@ + list.addFirst(node); + do { + list.addFirst(parent); +- parent = parent.getParent(); ++ parent = parent.getParentElement(); + } + while (parent != null); + return list; +@@ -953,7 +953,7 @@ + Element parent = ((Attribute)node).getParent(); + doc = parent == null ? null : parent.getDocument(); + } else if (node instanceof Text) { +- Element parent = ((Text)node).getParent(); ++ Element parent = ((Text)node).getParentElement(); + doc = parent == null ? null : parent.getDocument(); + } else if (node instanceof Document) + doc = (Document)node; +--- a/src/freemarker/ext/xml/JdomNavigator.java ++++ b/src/freemarker/ext/xml/JdomNavigator.java +@@ -169,7 +169,7 @@ + result.add(new Attribute("data", pi.getData())); + } + else { +- result.add(new Attribute(localName, pi.getValue(localName))); ++ result.add(new Attribute(localName, pi.getValue())); + } + } else if (node instanceof DocType) { + DocType doctype = (DocType)node; +@@ -206,22 +206,22 @@ + + Object getParent(Object node) { + if (node instanceof Element) { +- return((Element)node).getParent(); ++ return((Element)node).getParentElement(); + } + if (node instanceof Attribute) { + return((Attribute)node).getParent(); + } + if (node instanceof Text) { +- return((Text)node).getParent(); ++ return((Text)node).getParentElement(); + } + if (node instanceof ProcessingInstruction) { +- return((ProcessingInstruction)node).getParent(); ++ return((ProcessingInstruction)node).getParentElement(); + } + if (node instanceof Comment) { +- return((Comment)node).getParent(); ++ return((Comment)node).getParentElement(); + } + if (node instanceof EntityRef) { +- return((EntityRef)node).getParent(); ++ return((EntityRef)node).getParentElement(); + } + return null; + } +@@ -235,7 +235,7 @@ + return parent == null ? null : parent.getDocument(); + } + else if (node instanceof Text) { +- Element parent = ((Text)node).getParent(); ++ Element parent = ((Text)node).getParentElement(); + return parent == null ? null : parent.getDocument(); + } + else if (node instanceof Document) Modified: trunk/libfreemarker-java/debian/patches/series =================================================================== --- trunk/libfreemarker-java/debian/patches/series 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/patches/series 2009-09-27 08:50:37 UTC (rev 10655) @@ -1 +1,3 @@ class_name.diff +javarebel.diff +jdom1.diff Modified: trunk/libfreemarker-java/debian/rules =================================================================== --- trunk/libfreemarker-java/debian/rules 2009-09-27 08:00:32 UTC (rev 10654) +++ trunk/libfreemarker-java/debian/rules 2009-09-27 08:50:37 UTC (rev 10655) @@ -4,18 +4,15 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_BUILD_TARGET := jar javadoc -DEB_JARS := ant-nodeps dom4j servlet-api-2.5 el-api-2.1 jsp-api-2.1 jaxen jdom0 js junit \ +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 install/libfreemarker-java:: - install -m 644 -D 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 + dh_install -plibfreemarker-java freemarker.jar /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 get-orig-source: uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
