[pkg-java] r17887 - in tags/libfreemarker-java: . 2.3.20-1/debian 2.3.20-1/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 13 08:50:48 UTC 2014
Author: ebourg-guest
Date: 2014-03-13 08:50:48 +0000 (Thu, 13 Mar 2014)
New Revision: 17887
Added:
tags/libfreemarker-java/2.3.20-1/
tags/libfreemarker-java/2.3.20-1/debian/changelog
tags/libfreemarker-java/2.3.20-1/debian/compat
tags/libfreemarker-java/2.3.20-1/debian/control
tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude
tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh
tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/disable-test-coverage.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/exclude-avalon-logger.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/fix-tests-classpath.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/fix-unmappable-character.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/ivy-configuration.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/jython-compatibility.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/series
tags/libfreemarker-java/2.3.20-1/debian/pom.xml
tags/libfreemarker-java/2.3.20-1/debian/rules
Removed:
tags/libfreemarker-java/2.3.20-1/debian/ant.properties
tags/libfreemarker-java/2.3.20-1/debian/changelog
tags/libfreemarker-java/2.3.20-1/debian/compat
tags/libfreemarker-java/2.3.20-1/debian/control
tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude
tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh
tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/fix-classpath.patch
tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff
tags/libfreemarker-java/2.3.20-1/debian/patches/series
tags/libfreemarker-java/2.3.20-1/debian/pom.xml
tags/libfreemarker-java/2.3.20-1/debian/rules
Log:
[svn-buildpackage] Tagging libfreemarker-java 2.3.20-1
Deleted: tags/libfreemarker-java/2.3.20-1/debian/ant.properties
===================================================================
--- trunk/libfreemarker-java/debian/ant.properties 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/ant.properties 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,6 +0,0 @@
-all.libs.present=true
-project.name=freemarker
-class.dir=classes
-source.dir=src
-javadoc.dir=docs/api
-jar.name=freemarker.jar
Deleted: tags/libfreemarker-java/2.3.20-1/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/changelog 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,213 +0,0 @@
-libfreemarker-java (2.3.19-1) unstable; urgency=low
-
- * New upstream release
- * Refreshed the patches
- * Re-enabled Jython support (compilation issue fixed upstream)
- * Updated Standards-Version to 3.9.4: no changes needed.
- * Use canonical URLs for the Vcs-* fields
- * debian/copyright: Updated to the Copyright Format 1.0
- * debian/rules: Improved the clean target to allow rebuilds
- * debian/rules: Changed get-orig-source to download the current version
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 02 Jul 2013 21:47:18 +0200
-
-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.
- * d/patches/dtd_location.diff: Fix resolving of DTD when loading taglibs.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 22 Sep 2011 15:09:03 +0200
-
-libfreemarker-java (2.3.16-3) unstable; urgency=low
-
- * Disable jython support because it is broken with jython >= 2.5.
- (Closes: #591109)
- * Remove Paul from Uploaders list. Thanks to your contributions!
-
- -- Torsten Werner <twerner at debian.org> Wed, 04 Aug 2010 04:19:15 +0200
-
-libfreemarker-java (2.3.16-2) unstable; urgency=low
-
- [ Niels Thykier ]
- * Bumped Standards-Version to 3.8.4 - no changes required.
- * Replaced Build-Depends-Indep on liblogkit-java with
- libexcalibur-logkit-java.
- * Converted source to 3.0 (quilt).
- * Moved ant to Build-Depends because it is needed during clean.
- * Corrected Java runtime depends.
- * Added used java libraries to Depends and Suggests based on whether
- the build used them unconditionally.
- * Made the javadoc API link against the javadoc APIs installed on
- the system.
- - Added patch def-jdk-doc.patch.
-
- [ Damien Raude-Morvan ]
- * Upload to unstable.
- * libfreemarker-java-doc: move linked javadoc packages as Recommends
- (instead of Depends) as they are not strictly needed.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 27 Mar 2010 15:14:01 +0100
-
-libfreemarker-java (2.3.16-1) unstable; 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 14:08:08 +0100
-
-libfreemarker-java (2.3.15-1) unstable; urgency=low
-
- [ Torsten Werner ]
- * New upstream release
-
- [ Damien Raude-Morvan ]
- * 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
- * Build System:
- - Use upstream build.xml instead of debian/build.xml
- - Patch javacc.diff (use Debian JavaCC)
- - Patch jsp_api.diff (disable JSP 1.0/2.0 building)
- - Patch javarebel.diff (disable JavaRebel)
- - Include ant-junit in DEB_JARS
- * Remove unneeded shlibs:Depends variable
- * Install API Javadoc in /usr/share/doc/libfreemarker-java/api/
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 27 Sep 2009 22:31:38 +0200
-
-libfreemarker-java (2.3.14-1) experimental; urgency=low
-
- * New upstream release
- * Move API documentation to new binary package libfreemarker-java-doc.
- (Closes: #506362)
-
- -- Torsten Werner <twerner at debian.org> Thu, 04 Dec 2008 00:08:56 +0100
-
-libfreemarker-java (2.3.13+debian1-1) unstable; urgency=low
-
- * Move back into main.
- - Build-depend on servlet2.5 rather than glassfish-javaee.
- - Amended section in debian/control to "libs".
- - Added "+debian1" suffix to upstream version to ensure orig
- tarball available for move to main.
- * Added myself to uploaders.
- * Standards version now 3.8.0 (no changes needed).
-
- -- Paul Cager <paul-debian at home.paulcager.org> Wed, 18 Jun 2008 20:32:10 +0100
-
-libfreemarker-java (2.3.13-1) unstable; urgency=low
-
- * New upstream release
-
- -- Varun Hiremath <varun at debian.org> Wed, 14 May 2008 21:57:58 +0530
-
-libfreemarker-java (2.3.12-2) unstable; urgency=low
-
- * Move the package to contrib as glassfish-javaee is in contrib
- (Closes: #472190)
-
- -- Varun Hiremath <varun at debian.org> Sun, 23 Mar 2008 12:45:22 +0530
-
-libfreemarker-java (2.3.12-1) unstable; urgency=low
-
- * New upstream release
- * Set source=1.5 and target=1.5 for javac
-
- -- Varun Hiremath <varun at debian.org> Wed, 06 Feb 2008 17:03:40 +0530
-
-libfreemarker-java (2.3.11-1) unstable; urgency=low
-
- [ Torsten Werner ]
- * new upstream version
- * Bump up Standards-Version: 3.7.3 (no changes needed).
- * Replace Build-Depends: libservlet2.4-java by glassfish-javaee.
-
- [ Varun Hiremath ]
- * Add a new debian/build.xml
- * Add some more Build-Depends and jars for building
- * Move javadocs to api sub folder
- * Clean up patches
-
- -- Varun Hiremath <varun at debian.org> Fri, 21 Dec 2007 15:45:01 +0530
-
-libfreemarker-java (2.3.10-6) unstable; urgency=low
-
- * Move the package to pkg-java svn.
- * Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
- * Add patches/class_name.diff to fix the change in field name in newer
- version of jython (Closes: #450930)
-
- -- Varun Hiremath <varunhiremath at gmail.com> Fri, 16 Nov 2007 19:36:47 +0530
-
-libfreemarker-java (2.3.10-5) unstable; urgency=low
-
- * debian/control: Set Priority to optional from extra.
- * Remove debian/install and install jar from debian/rules and create
- symbolic link.
-
- -- Varun Hiremath <varunhiremath at gmail.com> Thu, 11 Oct 2007 14:03:30 +0530
-
-libfreemarker-java (2.3.10-4) unstable; urgency=low
-
- [ Varun Hiremath ]
- * Add debian/README.Debian-source file.
- * debian/control:
- + Add myself to Uploaders.
- + Add XS-Vcs-{Svn,Browser} headers.
-
- [ Torsten Werner ]
- * Use java-gcj-compat-dev instead of kaffe and change source version to 1.3.
- Thanks to Kumar Appaiah. (Closes: #439502)
-
- -- Torsten Werner <twerner at debian.org> Tue, 18 Sep 2007 22:08:04 +0200
-
-libfreemarker-java (2.3.10-3) unstable; urgency=low
-
- * Remove the whole docs directory because it contains generated files we
- don't have sources for.
-
- -- Torsten Werner <twerner at debian.org> Tue, 31 Jul 2007 20:47:06 +0200
-
-libfreemarker-java (2.3.10-2) unstable; urgency=low
-
- * Remove some dtd and xsd files from upstream tarball because of license
- issues.
-
- -- Torsten Werner <twerner at debian.org> Sun, 15 Jul 2007 09:14:06 +0200
-
-libfreemarker-java (2.3.10-1) unstable; urgency=low
-
- * Initial release (Closes: #427255)
-
- -- Torsten Werner <twerner at debian.org> Sun, 27 May 2007 19:15:16 +0200
Copied: tags/libfreemarker-java/2.3.20-1/debian/changelog (from rev 17880, trunk/libfreemarker-java/debian/changelog)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/changelog (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/changelog 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,238 @@
+libfreemarker-java (2.3.20-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ - Updated debian/pom.xml
+ - New build dependencies on ivy, bnd and liblog4j1.2-java
+ - Added a patch changing the ivy settings to use the Debian jars
+ - Added a patch to ignore the code related to avalon-logger
+ - Added a patch disabling the code coverage report
+ - Added a patch declaring the missing transitive test dependencies
+ * Removed the runtime dependency on libservlet2.5-java since the Servlet API
+ is provided by the web container
+ * Removed the runtime dependency on libcommons-logging-java and libslf4j-java,
+ FreeMarker doesn't mandate any logging framework.
+ * Fixed an unmappable character in LocalizedString.java preventing
+ the generation of the Javadoc.
+ * Switch to debhelper level 9
+ * Standards-Version updated to 3.9.5 (no changes)
+ * debian/orig-tar.sh:
+ - Updated for the new source layout
+ - Use XZ compression for the upstream tarball
+ - Do not exclude the taglib jars used by the tests
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Mar 2014 23:24:01 +0100
+
+libfreemarker-java (2.3.19-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed the patches
+ * Re-enabled Jython support (compilation issue fixed upstream)
+ * Updated Standards-Version to 3.9.4: no changes needed.
+ * Use canonical URLs for the Vcs-* fields
+ * debian/copyright: Updated to the Copyright Format 1.0
+ * debian/rules: Improved the clean target to allow rebuilds
+ * debian/rules: Changed get-orig-source to download the current version
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 02 Jul 2013 21:47:18 +0200
+
+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.
+ * d/patches/dtd_location.diff: Fix resolving of DTD when loading taglibs.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 22 Sep 2011 15:09:03 +0200
+
+libfreemarker-java (2.3.16-3) unstable; urgency=low
+
+ * Disable jython support because it is broken with jython >= 2.5.
+ (Closes: #591109)
+ * Remove Paul from Uploaders list. Thanks to your contributions!
+
+ -- Torsten Werner <twerner at debian.org> Wed, 04 Aug 2010 04:19:15 +0200
+
+libfreemarker-java (2.3.16-2) unstable; urgency=low
+
+ [ Niels Thykier ]
+ * Bumped Standards-Version to 3.8.4 - no changes required.
+ * Replaced Build-Depends-Indep on liblogkit-java with
+ libexcalibur-logkit-java.
+ * Converted source to 3.0 (quilt).
+ * Moved ant to Build-Depends because it is needed during clean.
+ * Corrected Java runtime depends.
+ * Added used java libraries to Depends and Suggests based on whether
+ the build used them unconditionally.
+ * Made the javadoc API link against the javadoc APIs installed on
+ the system.
+ - Added patch def-jdk-doc.patch.
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+ * libfreemarker-java-doc: move linked javadoc packages as Recommends
+ (instead of Depends) as they are not strictly needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 27 Mar 2010 15:14:01 +0100
+
+libfreemarker-java (2.3.16-1) unstable; 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 14:08:08 +0100
+
+libfreemarker-java (2.3.15-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * New upstream release
+
+ [ Damien Raude-Morvan ]
+ * 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
+ * Build System:
+ - Use upstream build.xml instead of debian/build.xml
+ - Patch javacc.diff (use Debian JavaCC)
+ - Patch jsp_api.diff (disable JSP 1.0/2.0 building)
+ - Patch javarebel.diff (disable JavaRebel)
+ - Include ant-junit in DEB_JARS
+ * Remove unneeded shlibs:Depends variable
+ * Install API Javadoc in /usr/share/doc/libfreemarker-java/api/
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 27 Sep 2009 22:31:38 +0200
+
+libfreemarker-java (2.3.14-1) experimental; urgency=low
+
+ * New upstream release
+ * Move API documentation to new binary package libfreemarker-java-doc.
+ (Closes: #506362)
+
+ -- Torsten Werner <twerner at debian.org> Thu, 04 Dec 2008 00:08:56 +0100
+
+libfreemarker-java (2.3.13+debian1-1) unstable; urgency=low
+
+ * Move back into main.
+ - Build-depend on servlet2.5 rather than glassfish-javaee.
+ - Amended section in debian/control to "libs".
+ - Added "+debian1" suffix to upstream version to ensure orig
+ tarball available for move to main.
+ * Added myself to uploaders.
+ * Standards version now 3.8.0 (no changes needed).
+
+ -- Paul Cager <paul-debian at home.paulcager.org> Wed, 18 Jun 2008 20:32:10 +0100
+
+libfreemarker-java (2.3.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Wed, 14 May 2008 21:57:58 +0530
+
+libfreemarker-java (2.3.12-2) unstable; urgency=low
+
+ * Move the package to contrib as glassfish-javaee is in contrib
+ (Closes: #472190)
+
+ -- Varun Hiremath <varun at debian.org> Sun, 23 Mar 2008 12:45:22 +0530
+
+libfreemarker-java (2.3.12-1) unstable; urgency=low
+
+ * New upstream release
+ * Set source=1.5 and target=1.5 for javac
+
+ -- Varun Hiremath <varun at debian.org> Wed, 06 Feb 2008 17:03:40 +0530
+
+libfreemarker-java (2.3.11-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * new upstream version
+ * Bump up Standards-Version: 3.7.3 (no changes needed).
+ * Replace Build-Depends: libservlet2.4-java by glassfish-javaee.
+
+ [ Varun Hiremath ]
+ * Add a new debian/build.xml
+ * Add some more Build-Depends and jars for building
+ * Move javadocs to api sub folder
+ * Clean up patches
+
+ -- Varun Hiremath <varun at debian.org> Fri, 21 Dec 2007 15:45:01 +0530
+
+libfreemarker-java (2.3.10-6) unstable; urgency=low
+
+ * Move the package to pkg-java svn.
+ * Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
+ * Add patches/class_name.diff to fix the change in field name in newer
+ version of jython (Closes: #450930)
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Fri, 16 Nov 2007 19:36:47 +0530
+
+libfreemarker-java (2.3.10-5) unstable; urgency=low
+
+ * debian/control: Set Priority to optional from extra.
+ * Remove debian/install and install jar from debian/rules and create
+ symbolic link.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Thu, 11 Oct 2007 14:03:30 +0530
+
+libfreemarker-java (2.3.10-4) unstable; urgency=low
+
+ [ Varun Hiremath ]
+ * Add debian/README.Debian-source file.
+ * debian/control:
+ + Add myself to Uploaders.
+ + Add XS-Vcs-{Svn,Browser} headers.
+
+ [ Torsten Werner ]
+ * Use java-gcj-compat-dev instead of kaffe and change source version to 1.3.
+ Thanks to Kumar Appaiah. (Closes: #439502)
+
+ -- Torsten Werner <twerner at debian.org> Tue, 18 Sep 2007 22:08:04 +0200
+
+libfreemarker-java (2.3.10-3) unstable; urgency=low
+
+ * Remove the whole docs directory because it contains generated files we
+ don't have sources for.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 31 Jul 2007 20:47:06 +0200
+
+libfreemarker-java (2.3.10-2) unstable; urgency=low
+
+ * Remove some dtd and xsd files from upstream tarball because of license
+ issues.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 15 Jul 2007 09:14:06 +0200
+
+libfreemarker-java (2.3.10-1) unstable; urgency=low
+
+ * Initial release (Closes: #427255)
+
+ -- Torsten Werner <twerner at debian.org> Sun, 27 May 2007 19:15:16 +0200
Deleted: tags/libfreemarker-java/2.3.20-1/debian/compat
===================================================================
--- trunk/libfreemarker-java/debian/compat 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/compat 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1 +0,0 @@
-7
Copied: tags/libfreemarker-java/2.3.20-1/debian/compat (from rev 17866, trunk/libfreemarker-java/debian/compat)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/compat (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/compat 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1 @@
+9
Deleted: tags/libfreemarker-java/2.3.20-1/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/control 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,108 +0,0 @@
-Source: libfreemarker-java
-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>,
- Emmanuel Bourg <ebourg at apache.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.4
-Homepage: http://www.freemarker.org
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libfreemarker-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libfreemarker-java
-
-Package: libfreemarker-java
-Architecture: all
-Depends: libcommons-logging-java,
- libservlet2.5-java,
- libslf4j-java,
- ${misc:Depends}
-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
- for end-users in itself, but something that programmers can embed into their
- products.
- .
- FreeMarker is designed to be practical for the generation of HTML Web pages,
- particularly by servlet-based applications following the MVC (Model View
- Controller) pattern. The idea behind using the MVC pattern for dynamic Web
- pages is that you separate the designers (HTML authors) from the programmers.
- Everybody works on what they are good at. Designers can change the appearance
- of a page without programmers having to change or recompile code, because the
- application logic (Java programs) and page design (FreeMarker templates) are
- separated. Templates do not become polluted with complex program fragments.
- This separation is useful even for projects where the programmer and the HMTL
- page author is the same person, since it helps to keep the application clear
- and easily maintainable.
-
-Package: libfreemarker-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: default-jdk-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: 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
- for end-users in itself, but something that programmers can embed into their
- products.
- .
- FreeMarker is designed to be practical for the generation of HTML Web pages,
- particularly by servlet-based applications following the MVC (Model View
- Controller) pattern. The idea behind using the MVC pattern for dynamic Web
- pages is that you separate the designers (HTML authors) from the programmers.
- Everybody works on what they are good at. Designers can change the appearance
- of a page without programmers having to change or recompile code, because the
- application logic (Java programs) and page design (FreeMarker templates) are
- separated. Templates do not become polluted with complex program fragments.
- This separation is useful even for projects where the programmer and the HMTL
- page author is the same person, since it helps to keep the application clear
- and easily maintainable.
- .
- This package contains the documentation of libfreemarker-java.
Copied: tags/libfreemarker-java/2.3.20-1/debian/control (from rev 17880, trunk/libfreemarker-java/debian/control)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/control (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/control 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,109 @@
+Source: libfreemarker-java
+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>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant,
+ ant-optional,
+ bnd,
+ cdbs,
+ debhelper (>= 9),
+ default-jdk,
+ default-jdk-doc,
+ ivy,
+ javacc,
+ jruby,
+ 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,
+ liblog4j1.2-java,
+ 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.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libfreemarker-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libfreemarker-java
+Homepage: http://www.freemarker.org
+
+Package: libfreemarker-java
+Architecture: all
+Depends: ${misc:Depends}
+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
+ for end-users in itself, but something that programmers can embed into their
+ products.
+ .
+ FreeMarker is designed to be practical for the generation of HTML Web pages,
+ particularly by servlet-based applications following the MVC (Model View
+ Controller) pattern. The idea behind using the MVC pattern for dynamic Web
+ pages is that you separate the designers (HTML authors) from the programmers.
+ Everybody works on what they are good at. Designers can change the appearance
+ of a page without programmers having to change or recompile code, because the
+ application logic (Java programs) and page design (FreeMarker templates) are
+ separated. Templates do not become polluted with complex program fragments.
+ This separation is useful even for projects where the programmer and the HMTL
+ page author is the same person, since it helps to keep the application clear
+ and easily maintainable.
+
+Package: libfreemarker-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: default-jdk-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: 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
+ for end-users in itself, but something that programmers can embed into their
+ products.
+ .
+ FreeMarker is designed to be practical for the generation of HTML Web pages,
+ particularly by servlet-based applications following the MVC (Model View
+ Controller) pattern. The idea behind using the MVC pattern for dynamic Web
+ pages is that you separate the designers (HTML authors) from the programmers.
+ Everybody works on what they are good at. Designers can change the appearance
+ of a page without programmers having to change or recompile code, because the
+ application logic (Java programs) and page design (FreeMarker templates) are
+ separated. Templates do not become polluted with complex program fragments.
+ This separation is useful even for projects where the programmer and the HMTL
+ page author is the same person, since it helps to keep the application clear
+ and easily maintainable.
+ .
+ This package contains the documentation of libfreemarker-java.
Deleted: tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude
===================================================================
--- trunk/libfreemarker-java/debian/orig-tar.exclude 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,4 +0,0 @@
-*.jar
-*/docs*
-*/src/freemarker/ext/jsp/*.dtd
-*/src/freemarker/ext/jsp/*.xsd
Copied: tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude (from rev 17874, trunk/libfreemarker-java/debian/orig-tar.exclude)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/orig-tar.exclude 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,7 @@
+freemarker.jar
+*/docs*
+*/src/freemarker/ext/jsp/*.dtd
+*/src/freemarker/ext/jsp/*.xsd
+.settings
+.project
+.classpath
Deleted: tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh
===================================================================
--- trunk/libfreemarker-java/debian/orig-tar.sh 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-
-DIR=libfreemarker-java-$2.orig
-
-# clean up the upstream tarball
-tar -x -z -f $3
-mv freemarker-$2 $DIR
-tar -c -z -f $3 -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
-fi
-
Copied: tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh (from rev 17873, trunk/libfreemarker-java/debian/orig-tar.sh)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/orig-tar.sh 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+VERSION=$2
+TAR=../libfreemarker-java_$VERSION.orig.tar.xz
+DIR=freemarker-$VERSION
+
+# clean up the upstream tarball
+mkdir $DIR
+tar -x -C $DIR -f $3
+mv $DIR/source $DIR/$DIR
+XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude -C $DIR $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,23 +0,0 @@
-Description: Link the javadoc against the system javadoc.
-Author: Niels Thykier <niels at thykier.net>
-
---- a/build.xml
-+++ b/build.xml
-@@ -461,6 +461,17 @@
- windowtitle="FreeMarker ${version} API"
- classpathref="compile.classpath.javadoc"
- use="${javadoc.use}">
-+ <link href="/usr/share/doc/default-jdk-doc/api/" />
-+ <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" />
-+ <link href="/usr/share/doc/rhino/api/" />
-+ <link href="/usr/share/doc/jython-doc/api-html/" />
-+ <link href="/usr/share/doc/liblog4j1.2-java/api/" />
-+ <link href="/usr/share/doc/libjaxen-java/api/" />
-+ <link href="/usr/share/doc/libjdom1-java/api/" />
-+ <link href="/usr/share/doc/libxerces2-java-doc/api/" />
-+ <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
-+ <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
-+ <link href="/usr/share/doc/libxalan2-java/api/" />
- </javadoc>
- </target>
-
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch (from rev 17877, trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/def-jdk-doc.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,27 @@
+Description: Link the javadoc against the system javadoc.
+Author: Niels Thykier <niels at thykier.net>
+
+--- a/build.xml
++++ b/build.xml
+@@ -534,8 +534,19 @@
+ author="true"
+ windowtitle="FreeMarker ${version} API"
+ classpath="build/classes"
+- classpathref="ivy.dep"
+- />
++ classpathref="ivy.dep">
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
++ <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" />
++ <link href="/usr/share/doc/rhino/api/" />
++ <link href="/usr/share/doc/jython-doc/api-html/" />
++ <link href="/usr/share/doc/liblog4j1.2-java/api/" />
++ <link href="/usr/share/doc/libjaxen-java/api/" />
++ <link href="/usr/share/doc/libjdom1-java/api/" />
++ <link href="/usr/share/doc/libxerces2-java-doc/api/" />
++ <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
++ <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
++ <link href="/usr/share/doc/libxalan2-java/api/" />
++ </javadoc>
+ <delete dir="build/javadoc-sources" />
+
+ <available file="build/api/resources/titlebar.gif" property="titlebar.found"/>
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/disable-test-coverage.patch (from rev 17873, trunk/libfreemarker-java/debian/patches/disable-test-coverage.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/disable-test-coverage.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/disable-test-coverage.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,37 @@
+Description: Disables the test coverage with Emma
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -391,23 +391,11 @@
+ <!-- ================================================================= -->
+
+ <target name="test" depends="compileTest" description="Run test cases">
+- <ivy:cachepath conf="emma" pathid="ivy.dep.emma" />
+- <taskdef
+- resource="emma_ant.properties" classpathref="ivy.dep.emma"
+- uri="http://emma.sourceforge.net/emma"
+- />
+
+ <property name="coverage.dir" location="build/coverage" />
+ <property name="coverage.classes.dir" location="build/coverage/classes" />
+ <mkdir dir="${coverage.classes.dir}" />
+ <property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation" />
+- <emma:emma enabled="true">
+- <instr
+- instrpath="build/classes" outdir="${coverage.classes.dir}"
+- outfile="${coverage.instrumentationfile}" mode="copy">
+- <filter excludes="*_Stub" />
+- </instr>
+- </emma:emma>
+ <copy todir="${coverage.classes.dir}" overwrite="false">
+ <fileset dir="build/classes" />
+ <fileset dir="build/test-classes" />
+@@ -420,7 +408,6 @@
+ <sysproperty key="emma.coverage.out.file" value="${coverage.outfile}" />
+ <classpath>
+ <pathelement path="${coverage.classes.dir}" />
+- <path refid="ivy.dep.emma" />
+ <path refid="ivy.dep.test" />
+ </classpath>
+ <formatter type="plain" />
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/dtd_location.diff 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,50 +0,0 @@
-Description: Since */src/freemarker/ext/jsp/*.dtd and
- */src/freemarker/ext/jsp/*.xsd has been removed from orig tarball,
- resolve those files using classpath (into jsp-api-2.1.jar
- and servlet-api-2.5.jar)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-09-22
-Forwarded: no
-Index: b/src/freemarker/ext/jsp/TaglibFactory.java
-===================================================================
---- a/src/freemarker/ext/jsp/TaglibFactory.java
-+++ b/src/freemarker/ext/jsp/TaglibFactory.java
-@@ -688,25 +688,26 @@
- static
- {
- // JSP taglib 2.1
-- dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "web-jsptaglibrary_2_1.xsd");
-+ dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd");
- // JSP taglib 2.0
-- dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "web-jsptaglibrary_2_0.xsd");
-+ dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd");
- // JSP taglib 1.2
-- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "web-jsptaglibrary_1_2.dtd");
-- dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "web-jsptaglibrary_1_2.dtd");
-+ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
-+ dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
- // JSP taglib 1.1
-- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "web-jsptaglibrary_1_1.dtd");
-- dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "web-jsptaglibrary_1_1.dtd");
-+ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
-+ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
-+ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
- // Servlet 2.5
-- dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "web-app_2_5.xsd");
-+ dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "/javax/servlet/resources/web-app_2_5.xsd");
- // Servlet 2.4
-- dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "web-app_2_4.xsd");
-+ dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "/javax/servlet/resources/web-app_2_4.xsd");
- // Servlet 2.3
-- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "web-app_2_3.dtd");
-- dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "web-app_2_3.dtd");
-+ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "/javax/servlet/resources/web-app_2_3.dtd");
-+ dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "/javax/servlet/resources/web-app_2_3.dtd");
- // Servlet 2.2
-- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "web-app_2_2.dtd");
-- dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "web-app_2_2.dtd");
-+ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "/javax/servlet/resources/web-app_2_2.dtd");
-+ dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "/javax/servlet/resources/web-app_2_2.dtd");
- }
- private static final class LocalTaglibDtds implements EntityResolver {
- public InputSource resolveEntity(String publicId, String systemId)
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff (from rev 17873, trunk/libfreemarker-java/debian/patches/dtd_location.diff)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/dtd_location.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,48 @@
+Description: Since */src/freemarker/ext/jsp/*.dtd and
+ */src/freemarker/ext/jsp/*.xsd has been removed from orig tarball,
+ resolve those files using classpath (into jsp-api-2.1.jar
+ and servlet-api-2.5.jar)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-22
+Forwarded: no
+--- a/src/main/java/freemarker/ext/jsp/TaglibFactory.java
++++ b/src/main/java/freemarker/ext/jsp/TaglibFactory.java
+@@ -687,25 +687,26 @@
+ static
+ {
+ // JSP taglib 2.1
+- dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "web-jsptaglibrary_2_1.xsd");
++ dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd");
+ // JSP taglib 2.0
+- dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "web-jsptaglibrary_2_0.xsd");
++ dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd");
+ // JSP taglib 1.2
+- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "web-jsptaglibrary_1_2.dtd");
+- dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "web-jsptaglibrary_1_2.dtd");
++ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
++ dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
+ // JSP taglib 1.1
+- dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "web-jsptaglibrary_1_1.dtd");
+- dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "web-jsptaglibrary_1_1.dtd");
++ dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
++ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
++ dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
+ // Servlet 2.5
+- dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "web-app_2_5.xsd");
++ dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "/javax/servlet/resources/web-app_2_5.xsd");
+ // Servlet 2.4
+- dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "web-app_2_4.xsd");
++ dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "/javax/servlet/resources/web-app_2_4.xsd");
+ // Servlet 2.3
+- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "web-app_2_3.dtd");
+- dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "web-app_2_3.dtd");
++ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "/javax/servlet/resources/web-app_2_3.dtd");
++ dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "/javax/servlet/resources/web-app_2_3.dtd");
+ // Servlet 2.2
+- dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "web-app_2_2.dtd");
+- dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "web-app_2_2.dtd");
++ dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "/javax/servlet/resources/web-app_2_2.dtd");
++ dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "/javax/servlet/resources/web-app_2_2.dtd");
+ }
+ private static final class LocalTaglibDtds implements EntityResolver {
+ public InputSource resolveEntity(String publicId, String systemId)
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/exclude-avalon-logger.patch (from rev 17873, trunk/libfreemarker-java/debian/patches/exclude-avalon-logger.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/exclude-avalon-logger.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/exclude-avalon-logger.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,13 @@
+Description: Excludes the Avalon Logger support (not in Debian and obsolete)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -221,6 +221,7 @@
+ classpathref="ivy.dep"
+ bootclasspath="${boot.classpath.j2se1.2}"
+ excludes="
++ freemarker/log/_AvalonLoggerFactory.java,
+ freemarker/log/_JDK14LoggerFactory.java,
+ freemarker/core/_RegexBuiltins.java,
+ freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java,
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/fix-classpath.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/fix-classpath.patch 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/fix-classpath.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,24 +0,0 @@
-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 <ebourg at 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>
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/fix-tests-classpath.patch (from rev 17877, trunk/libfreemarker-java/debian/patches/fix-tests-classpath.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/fix-tests-classpath.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/fix-tests-classpath.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,18 @@
+Description: Declares the missing transitive dependencies required to run the tests
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -119,6 +119,12 @@
+
+ <!-- Note: Ant doesn't contain junit.jar anymore, so we add it to conf "test" too. -->
+ <dependency org="junit" name="junit" rev="3.7" conf="build.test->default; test->default" />
++ <dependency org="com.google.guava" name="guava" rev="15.0" conf="build.test->default; test->default" />
++ <dependency org="org.jruby.extras" name="constantine" rev="0.7" conf="build.test->default; test->default" />
++ <dependency org="org.jruby" name="jruby" rev="1.7.11" conf="build.test->default; test->default" />
++ <dependency org="org.antlr" name="antlr3" rev="3.2" conf="build.test->default; test->default" />
++ <dependency org="org.antlr" name="antlr3-runtime" rev="3.2" conf="build.test->default; test->default" />
++ <dependency org="asm" name="asm3-all" rev="3.3" conf="build.test->default; test->default" />
+
+ <!-- parser -->
+
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/fix-unmappable-character.patch (from rev 17873, trunk/libfreemarker-java/debian/patches/fix-unmappable-character.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/fix-unmappable-character.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/fix-unmappable-character.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,14 @@
+Description: Fixes an unmappable character for encoding UTF8 that breaks the generation of the Javadoc
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/freemarker/template/LocalizedString.java
++++ b/src/main/java/freemarker/template/LocalizedString.java
+@@ -14,7 +14,7 @@
+ * if "fr".equals(lang)
+ * return "oui";
+ * else if "de".equals(lang)
+- * return "sí";
++ * return "ja";
+ * else
+ * return "yes";
+ * }
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/ivy-configuration.patch (from rev 17873, trunk/libfreemarker-java/debian/patches/ivy-configuration.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/ivy-configuration.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/ivy-configuration.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,161 @@
+Description: Modifies the ivy configuration to use the jars in /usr/share/java
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/ivysettings.xml
++++ b/ivysettings.xml
+@@ -1,35 +1,12 @@
+ <ivysettings>
+- <!-- Prevent IvyDE error: -->
+- <property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false" />
+-
+- <caches defaultCacheDir="${ivy.project.dir}/.ivy/cache">
+- <cache name="cacheForPrivate" useOrigin="true" defaultTTL="1s" />
+-
+- <!--
+- Rather don't use useOrigin="true" here, as deleting from the target repo breaks the cache then.
+- -->
+- <cache name="cacheForLocalOverride"
+- basedir="${user.home}/.ivy2/freemarker-devel-local-override-cache"
+- defaultTTL="1s" lockStrategy="artifact-lock"
+- />
+- </caches>
++ <settings defaultResolver="debian" />
+ <resolvers>
+- <chain name="freemarker-devel-local" returnFirst="true">
+- <filesystem name="freemarker-devel-local-override" cache="cacheForLocalOverride">
+- <ivy pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${user.home}/.ivy2/freemarker-devel-local-override/[organisation]/[module]/[artifact]-[revision].[ext]" />
+- </filesystem>
+- <filesystem name="project-private" cache="cacheForPrivate">
+- <ivy pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${ivy.project.dir}/.ivy/repo/[organisation]/[module]/[artifact]-[revision].[ext]" />
+- </filesystem>
+- </chain>
+- <filesystem name="server-publishing-target">
+- <ivy pattern="${server.ivy.repo.root}/[organisation]/[module]/ivy-[revision].xml" />
+- <artifact pattern="${server.ivy.repo.root}/[organisation]/[module]/[artifact]-[revision].[ext]" />
++ <filesystem name="debian">
++<!-- <ivy pattern="${user.home}/.ivy2/debian/[organisation]/[module]/ivy-[revision].xml" />-->
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+ </resolvers>
+ <modules>
+- <module organisation="*" resolver="freemarker-devel-local" />
++ <module organisation="*" resolver="debian" />
+ </modules>
+ </ivysettings>
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -20,7 +20,7 @@
+ <conf name="build.base" extends="default" visibility="private"
+ description="for building FreeMarker without dependencies that has multiple versions"
+ />
+- <conf name="build" extends="build.jsp2.0"
++ <conf name="build" extends="build.jsp2.1"
+ description="for building FreeMarker with default dependencies"
+ />
+
+@@ -86,25 +86,21 @@
+
+ <dependency org="xml-apis" name="xml-apis" rev="1.3.04" conf="build.base->default" /> <!-- as it wasn't part of J2SE 1.2 -->
+ <dependency org="jaxen" name="jaxen" rev="1.0-FCS" conf="build.base->default" />
+- <dependency org="saxpath" name="saxpath" rev="1.0-FCS" conf="build.base->default" />
+- <dependency org="xalan" name="xalan" rev="2.7.0" conf="build.base->default">
++ <dependency org="xalan" name="xalan2" rev="2.7.0" conf="build.base->default">
+ <!-- The lowerst supported xml-apis version is an explicit dependency; prevent eviction: -->
+ <exclude org="xml-apis" module="xml-apis" />
+ </dependency>
+ <dependency org="dom4j" name="dom4j" rev="1.3" conf="build.base->default" /> <!-- legacy -->
+- <dependency org="org.jdom" name="jdom" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy -->
++ <dependency org="org.jdom" name="jdom1" rev="1.0-beta8-dev" conf="build.base->default" /> <!-- legacy -->
+
+ <dependency org="ant" name="ant" rev="1.6.5" conf="build.base->default">
+ <!-- The lowerst supported xml-apis version is an explicit dependency; prevent eviction: -->
+ <exclude org="xml-apis" module="xml-apis" />
+ </dependency>
+
+- <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
+- <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
+- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default; example.struts-webapp->default" />
+- <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default; example.servlet->default" />
+- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
+- <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
++ <dependency org="javax.el" name="el-api-2.1" rev="2.1" conf="build.jsp2.1->default" />
++ <dependency org="javax.servlet.jsp" name="jsp-api-2.1" rev="2.1" conf="build.jsp2.1->default" />
++ <dependency org="javax.servlet" name="servlet-api-2.5" rev="2.5" conf="build.jsp2.1->default" />
+
+ <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
+
+@@ -112,13 +108,10 @@
+ <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" />
+ <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />
+
+- <dependency org="log4j" name="log4j" rev="1.2.6" conf="build.base->default" />
+- <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" />
++ <dependency org="log4j" name="log4j-1.2" rev="1.2.6" conf="build.base->default" />
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="build.base->default" />
+ <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />
+
+- <dependency org="org.zeroturnaround" name="javarebel-sdk" rev="1.2.2" conf="build.base->default" />
+-
+ <!--dependency org="javax.script" name="script-api" rev="1.0" conf="build.base->default" /-->
+ <!--dependency org="org.visigoths" name="cavalry" rev="1.0" conf="build.base->default" /-->
+
+@@ -127,15 +120,6 @@
+ <!-- Note: Ant doesn't contain junit.jar anymore, so we add it to conf "test" too. -->
+ <dependency org="junit" name="junit" rev="3.7" conf="build.test->default; test->default" />
+
+- <!-- docs -->
+-
+- <dependency org="org.freemarker" name="docgen" rev="1.0-branch-head" conf="manual->default" changing="true" />
+-
+- <!-- EMMA -->
+-
+- <dependency org="emma" name="emma" rev="2.0.5312" conf="emma->default" />
+- <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="emma->default" />
+-
+ <!-- parser -->
+
+ <dependency org="net.java.dev.javacc" name="javacc" rev="3.2" conf="parser->default" />
+@@ -154,4 +138,4 @@
+ <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
+
+ </dependencies>
+-</ivy-module>
+\ No newline at end of file
++</ivy-module>
+--- a/build.xml
++++ b/build.xml
+@@ -946,29 +946,11 @@
+ >
+ <echo>Getting dependencies...</echo>
+ <echo>-------------------------------------------------------</echo>
+- <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml" />
+ <!-- Build an own repository that will serve us even offline: -->
+- <ivy:retrieve settingsRef="remote" sync="true"
+- ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"
+- pattern=".ivy.part/repo/[organisation]/[module]/[artifact]-[revision].[ext]"
++ <ivy:retrieve sync="true"
++ ivypattern=".ivy/repo/[organisation]/[module]/ivy-[revision].xml"
++ pattern=".ivy/repo/[organisation]/[module]/[artifact]-[revision].[ext]"
+ />
+- <echo>-------------------------------------------------------</echo>
+- <echo>*** Successfully acquired dependencies from the Web ***</echo>
+- <echo>Eclipse users: Now right-click on ivy.xml and Resolve! </echo>
+- <echo>-------------------------------------------------------</echo>
+- <!-- Only now that we got all the dependencies will we delete anything. -->
+- <!-- Thus a net or repo outage doesn't left us without the dependencies. -->
+-
+- <!-- Save the resolution cache from the soon coming <delete>: -->
+- <move todir=".ivy.part/update-deps-reso-cache">
+- <fileset dir=".ivy/update-deps-reso-cache" />
+- </move>
+- <!-- Drop all the old stuff: -->
+- <delete dir=".ivy" />
+- <!-- And use the new stuff instead: -->
+- <move todir=".ivy">
+- <fileset dir=".ivy.part" />
+- </move>
+ </target>
+
+ <!-- Do NOT call this from 'clean'; offline guys would stuck after that. -->
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,30 +0,0 @@
-Description: Use JavaCC from Debian
-Forwarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-09-27
---- a/build.xml
-+++ b/build.xml
-@@ -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"
- />
-
- <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/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"
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff (from rev 17873, trunk/libfreemarker-java/debian/patches/javacc.diff)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/javacc.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,32 @@
+Description: Use JavaCC from Debian
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/build.xml
++++ b/build.xml
+@@ -132,7 +132,6 @@
+ <ivy:cachepath conf="parser" pathid="ivy.dep" />
+ <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
+ uri="http://javacc.dev.java.net/"
+- classpathref="ivy.dep"
+ />
+
+ <property name="_javaccOutputDir"
+@@ -144,7 +143,7 @@
+ <javacc:generate
+ target="src/main/javacc/FTL.jj"
+ outputdirectory="${_javaccOutputDir}"
+- javacchome="build/javacc-home.tmp"
++ javacchome="/usr/share/java/" jdkversion="1.3"
+ />
+ <delete dir="build/javacc-home.tmp" />
+
+@@ -166,7 +165,7 @@
+ <replace
+ file="${_javaccOutputDir}/Token.java"
+ token="public class Token"
+- value="class Token implements java.io.Serializable"
++ value="class Token"
+ />
+ <replace
+ file="${_javaccOutputDir}/SimpleCharStream.java"
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,39 +0,0 @@
-Description:
- Disable JavaRebelIntegration (no yet in Debian and non-free stuff)
-Forwarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-09-27
---- a/build.xml
-+++ b/build.xml
-@@ -158,6 +158,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"/>
---- 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);
- }
- }
-
-@@ -1672,13 +1671,7 @@
-
-
- private static boolean isJavaRebelAvailable() {
-- try {
-- JavaRebelIntegration.testAvailability();
-- return true;
-- }
-- catch(NoClassDefFoundError e) {
- return false;
-- }
- }
-
- /**
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff (from rev 17873, trunk/libfreemarker-java/debian/patches/javarebel.diff)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/javarebel.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,39 @@
+Description:
+ Disable JavaRebelIntegration (no yet in Debian and non-free stuff)
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/src/main/java/freemarker/ext/beans/BeansWrapper.java
++++ b/src/main/java/freemarker/ext/beans/BeansWrapper.java
+@@ -251,7 +251,6 @@
+ */
+ public BeansWrapper() {
+ if(javaRebelAvailable) {
+- JavaRebelIntegration.registerWrapper(this);
+ }
+ }
+
+@@ -1780,13 +1779,7 @@
+
+
+ private static boolean isJavaRebelAvailable() {
+- try {
+- JavaRebelIntegration.testAvailability();
+- return true;
+- }
+- catch(NoClassDefFoundError e) {
+ return false;
+- }
+ }
+
+ /**
+--- a/build.xml
++++ b/build.xml
+@@ -227,6 +227,7 @@
+ freemarker/template/utility/J2SE14TimeZoneOffsetCalculator.java,
+
+ freemarker/ext/beans/_EnumModels.java,
++ freemarker/ext/beans/JavaRebelIntegration.java,
+ freemarker/ext/dom/SunInternalXalanXPathSupport.java,
+
+ freemarker/ext/jsp/TaglibFactory.java,
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jdom1.diff 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,113 +0,0 @@
-Description: Compatibility with JDOM 1.x API
-Forwarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-09-27
---- 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.getPseudoAttributeValue(localName));
- } 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.getPseudoAttributeValue(localName)));
- }
- } 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)
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff (from rev 17873, trunk/libfreemarker-java/debian/patches/jdom1.diff)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/jdom1.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,113 @@
+Description: Compatibility with JDOM 1.x API
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/src/main/java/freemarker/ext/jdom/NodeListModel.java
++++ b/src/main/java/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.getPseudoAttributeValue(localName));
+ } 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/main/java/freemarker/ext/xml/_JdomNavigator.java
++++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
+@@ -171,7 +171,7 @@
+ result.add(new Attribute("data", pi.getData()));
+ }
+ else {
+- result.add(new Attribute(localName, pi.getValue(localName)));
++ result.add(new Attribute(localName, pi.getPseudoAttributeValue(localName)));
+ }
+ } else if (node instanceof DocType) {
+ DocType doctype = (DocType)node;
+@@ -208,22 +208,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;
+ }
+@@ -237,7 +237,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)
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,32 +0,0 @@
-Description: Remove JSP 1.x and 2.0 API usage
-Forwarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-09-27
---- a/build.xml
-+++ b/build.xml
-@@ -89,8 +89,6 @@
- </path>
-
- <path id="compile.jsp1.classpath">
-- <path refid="compile.nomultiversion.classpath"/>
-- <pathelement path="${lib.jsp12}"/>
- </path>
-
- <path id="compile.jsp2.classpath">
-@@ -250,7 +248,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">
-@@ -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-jython20"/>
- <antcall target="compile-jython22"/>
- <antcall target="compile-jython25"/>
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff (from rev 17873, trunk/libfreemarker-java/debian/patches/jsp_api.diff)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/jsp_api.diff 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,34 @@
+Description: Remove JSP 1.x and 2.0 API usage
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+--- a/build.xml
++++ b/build.xml
+@@ -231,7 +231,9 @@
+
+ freemarker/ext/jsp/TaglibFactory.java,
+ freemarker/ext/jsp/_FreeMarkerPageContext1.java,
++ freemarker/ext/jsp/_FreeMarkerPageContext2.java,
+ freemarker/ext/jsp/_FreeMarkerPageContext21.java,
++ freemarker/ext/jsp/FreeMarkerJspFactory2.java,
+ freemarker/ext/jsp/FreeMarkerJspFactory21.java,
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java,
+
+@@ -274,17 +276,6 @@
+ freemarker/ext/dom/SunInternalXalanXPathSupport.java"
+ />
+
+- <ivy:cachepath conf="build.jsp1.2" pathid="ivy.dep.jsp1.2" />
+- <javac srcdir="src/main/java" destdir="build/classes" deprecation="off"
+- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jsp1.2"
+- bootclasspath="${boot.classpath.j2se1.2}"
+- includes="
+- freemarker/ext/jsp/TaglibFactory.java,
+- freemarker/ext/jsp/_FreeMarkerPageContext1.java"
+- />
+-
+ <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
+
+ <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/jython-compatibility.patch (from rev 17873, trunk/libfreemarker-java/debian/patches/jython-compatibility.patch)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/jython-compatibility.patch (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/jython-compatibility.patch 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,51 @@
+Description: Compile only the classes compatible with the version of jython in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -291,41 +291,21 @@
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+ />
+
+- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
++ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+ <javac srcdir="src/main/java" destdir="build/classes" deprecation="off"
+ debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8"
+ includeantruntime="false"
+- classpathref="ivy.dep.jython2.0"
+- bootclasspath="${boot.classpath.j2se1.2}"
++ classpathref="ivy.dep.jython2.5"
++ bootclasspath="${boot.classpath.j2se1.5}"
+ includes="
+ freemarker/ext/ant/**,
+ freemarker/template/utility/JythonRuntime.java,
+ freemarker/ext/jython/**"
+ excludes="
+- freemarker/ext/jython/_Jython22VersionAdapter.java,
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+-
+- <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
+- <javac srcdir="src/main/java" destdir="build/classes" deprecation="off"
+- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.2"
+- bootclasspath="${boot.classpath.j2se1.2}"
+- includes="
++ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
+ freemarker/ext/jython/_Jython22VersionAdapter.java"
+ />
+
+- <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+- <javac srcdir="src/main/java" destdir="build/classes" deprecation="off"
+- debug="on" optimize="off" target="1.2" source="1.2" encoding="utf-8"
+- includeantruntime="false"
+- classpathref="ivy.dep.jython2.5"
+- bootclasspath="${boot.classpath.j2se1.5}"
+- includes="
+- freemarker/ext/jython/_Jython25VersionAdapter.java"
+- />
+-
+ <rmic base="build/classes" classpathref="ivy.dep"
+ includes="src/main/java/freemarker/debug/impl/Rmi*Impl.class"
+ verify="yes" stubversion="1.2"
Deleted: tags/libfreemarker-java/2.3.20-1/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/series 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,7 +0,0 @@
-javarebel.diff
-jdom1.diff
-javacc.diff
-jsp_api.diff
-def-jdk-doc.patch
-dtd_location.diff
-fix-classpath.patch
Copied: tags/libfreemarker-java/2.3.20-1/debian/patches/series (from rev 17877, trunk/libfreemarker-java/debian/patches/series)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/patches/series (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/patches/series 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,12 @@
+javarebel.diff
+jdom1.diff
+javacc.diff
+jsp_api.diff
+def-jdk-doc.patch
+dtd_location.diff
+fix-unmappable-character.patch
+ivy-configuration.patch
+exclude-avalon-logger.patch
+jython-compatibility.patch
+disable-test-coverage.patch
+fix-tests-classpath.patch
Deleted: tags/libfreemarker-java/2.3.20-1/debian/pom.xml
===================================================================
--- trunk/libfreemarker-java/debian/pom.xml 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/pom.xml 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,29 +0,0 @@
-<?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.19</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
Copied: tags/libfreemarker-java/2.3.20-1/debian/pom.xml (from rev 17873, trunk/libfreemarker-java/debian/pom.xml)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/pom.xml (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/pom.xml 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,51 @@
+<?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>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.20</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>
+ <connection>scm:git:git at github.com:freemarker/freemarker.git</connection>
+ <developerConnection>scm:git:git at github.com:freemarker/freemarker.git</developerConnection>
+ <url>git at github.com:freemarker/freemarker.git</url>
+ </scm>
+ <developers>
+ <developer>
+ <name>Attila Szegedi</name>
+ </developer>
+ <developer>
+ <name>Daniel Dekany</name>
+ <email>ddekany at freemail.hu</email>
+ </developer>
+ <developer>
+ <name>Jonathan Revusky</name>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <!-- no required dependencies -->
+ </dependencies>
+</project>
Deleted: tags/libfreemarker-java/2.3.20-1/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2014-03-12 09:30:32 UTC (rev 17865)
+++ tags/libfreemarker-java/2.3.20-1/debian/rules 2014-03-13 08:50:48 UTC (rev 17887)
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-POM_VERSION := 2.3.19
-MAVEN_REPO := http://repo1.maven.org/maven2/
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_ANT_BUILD_TARGET := javacc jar javadoc
-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 commons-logging slf4j-api xercesImpl xalan2 commons-jxpath ant-junit
-
-install/libfreemarker-java::
- mh_installpoms -plibfreemarker-java
- mh_installjar -plibfreemarker-java -l debian/pom.xml lib/freemarker.jar
-
-clean::
- mh_clean
-
-get-orig-source:
- uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
-
-get-orig-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
Copied: tags/libfreemarker-java/2.3.20-1/debian/rules (from rev 17873, trunk/libfreemarker-java/debian/rules)
===================================================================
--- tags/libfreemarker-java/2.3.20-1/debian/rules (rev 0)
+++ tags/libfreemarker-java/2.3.20-1/debian/rules 2014-03-13 08:50:48 UTC (rev 17887)
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+POM_VERSION := 2.3.20
+MAVEN_REPO := http://repo1.maven.org/maven2/
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_ANT_BUILD_TARGET := javacc jar javadoc
+DEB_ANT_CHECK_TARGET := test
+
+DEB_JARS := ant-nodeps junit ant-junit ivy
+
+install/libfreemarker-java::
+ mh_installpoms -plibfreemarker-java
+ mh_installjar -plibfreemarker-java -l debian/pom.xml build/freemarker.jar
+
+clean::
+ mh_clean
+ rm -Rf .ivy
+
+get-orig-source:
+ uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+
+get-orig-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