[pkg-java] r15002 - in tags/libfreemarker-java: . 2.3.18-1/debian 2.3.18-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Sep 22 13:14:57 UTC 2011
Author: drazzib
Date: 2011-09-22 13:14:57 +0000 (Thu, 22 Sep 2011)
New Revision: 15002
Added:
tags/libfreemarker-java/2.3.18-1/
tags/libfreemarker-java/2.3.18-1/debian/changelog
tags/libfreemarker-java/2.3.18-1/debian/control
tags/libfreemarker-java/2.3.18-1/debian/copyright
tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install
tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch
tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch
tags/libfreemarker-java/2.3.18-1/debian/patches/dtd_location.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/series
tags/libfreemarker-java/2.3.18-1/debian/pom.xml
tags/libfreemarker-java/2.3.18-1/debian/rules
Removed:
tags/libfreemarker-java/2.3.18-1/debian/changelog
tags/libfreemarker-java/2.3.18-1/debian/control
tags/libfreemarker-java/2.3.18-1/debian/copyright
tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install
tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch
tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch
tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff
tags/libfreemarker-java/2.3.18-1/debian/patches/series
tags/libfreemarker-java/2.3.18-1/debian/pom.xml
tags/libfreemarker-java/2.3.18-1/debian/rules
Log:
[svn-buildpackage] Tagging libfreemarker-java 2.3.18-1
Deleted: tags/libfreemarker-java/2.3.18-1/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/changelog 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,192 +0,0 @@
-libfreemarker-java (2.3.16-4) UNRELEASED; urgency=low
-
- * 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.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 25 May 2011 23:27:25 +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.18-1/debian/changelog (from rev 15001, trunk/libfreemarker-java/debian/changelog)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/changelog (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/changelog 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,200 @@
+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.18-1/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/control 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,79 +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>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: ant-optional, libservlet2.5-java,
- javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom1-java,
- liblog4j1.2-java, libexcalibur-logkit-java, libxerces2-java, librhino-java,
- libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc,
- libdom4j-java-doc, librhino-java-doc, jython-doc, liblog4j1.2-java-doc,
- libjaxen-java-doc, libjdom1-java-doc, libxerces2-java-doc,
- libcommons-jxpath-java-doc, libxalan2-java-doc
-Standards-Version: 3.9.2
-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: libservlet2.5-java,
- ${misc:Depends}
-Suggests: jython, librhino-java, libjdom1-java, libdom4j-java, libjaxen-java,
- libxalan2-java, libexcalibur-logkit-java
-Description: a template engine written in Java
- 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,
- libjdom1-java-doc,
- libdom4j-java-doc,
- libjaxen-java-doc,
- liblog4j1.2-java-doc,
- libxalan2-java-doc,
- libxerces2-java-doc,
- librhino-java-doc
-Suggests: libfreemarker-java
-Description: a template engine written in Java (documentation)
- FreeMarker is a "template engine"; a generic tool to generate text output
- (anything from HTML to autogenerated source code) based on templates. It's a
- 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.18-1/debian/control (from rev 14997, trunk/libfreemarker-java/debian/control)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/control (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/control 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,107 @@
+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>
+Build-Depends: ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ default-jdk-doc,
+ javacc,
+ junit,
+ jython,
+ jython-doc,
+ libcommons-jxpath-java,
+ libcommons-jxpath-java-doc,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libdom4j-java,
+ libdom4j-java-doc,
+ libjaxen-java,
+ libjaxen-java-doc,
+ libjdom1-java,
+ libjdom1-java-doc,
+ librhino-java,
+ librhino-java-doc,
+ libservlet2.5-java,
+ libslf4j-java,
+ libxalan2-java,
+ libxalan2-java-doc,
+ libxerces2-java,
+ libxerces2-java-doc,
+ maven-repo-helper
+Standards-Version: 3.9.2
+Homepage: http://www.freemarker.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
+Vcs-Browser: http://svn.debian.org/wsvn/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.
Deleted: tags/libfreemarker-java/2.3.18-1/debian/copyright
===================================================================
--- trunk/libfreemarker-java/debian/copyright 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/copyright 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,49 +0,0 @@
-This package was debianized by Torsten Werner <twerner at debian.org> on
-Sat Jun 2 19:54:42 CEST 2007.
-
-It was downloaded from
-<http://sourceforge.net/project/showfiles.php?group_id=794&package_id=787>.
-
-Upstream Authors: The Visigoth Software Society
-
-Copyright 2003 The Visigoth Software Society. All rights reserved.
-
-License:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. The end-user documentation included with the redistribution, if any, must
- include the following acknowlegement:
- "This product includes software developed by the
- Visigoth Software Society (http://www.visigoths.org/)."
- Alternately, this acknowlegement may appear in the software itself, if and
- wherever such third-party acknowlegements normally appear.
-
- 3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the
- project contributors may be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact visigoths at visigoths.org.
-
- 4. Products derived from this software may not be called "FreeMarker" or
- "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
- without prior written permission of the Visigoth Software Society.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- VISIGOTH SOFTWARE SOCIETY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The Debian packaging is
-Copyright 2007, Torsten Werner <twerner at debian.org>
-Copyright 2009, Damien Raude-Morvan <drazzib at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Copied: tags/libfreemarker-java/2.3.18-1/debian/copyright (from rev 14997, trunk/libfreemarker-java/debian/copyright)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/copyright (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/copyright 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,47 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: FreeMarker
+Upstream-Contact: The Visigoth Software Society
+Source: http://sourceforge.net/project/showfiles.php?group_id=794&package_id=787
+
+Files: *
+Copyright: Copyright 2003 The Visigoth Software Society. All rights reserved.
+License: BSD-4-clause
+
+Files: debian/*
+Copyright: Copyright 2007, Torsten Werner <twerner at debian.org>
+Copyright: Copyright 2009-2011, Damien Raude-Morvan <drazzib at debian.org>
+License: BSD-4-clause
+
+License: BSD-4-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. The end-user documentation included with the redistribution, if any, must
+ include the following acknowlegement:
+ "This product includes software developed by the
+ Visigoth Software Society (http://www.visigoths.org/)."
+ Alternately, this acknowlegement may appear in the software itself, if and
+ wherever such third-party acknowlegements normally appear.
+ .
+ 3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the
+ project contributors may be used to endorse or promote products derived
+ from this software without prior written permission. For written
+ permission, please contact visigoths at visigoths.org.
+ .
+ 4. Products derived from this software may not be called "FreeMarker" or
+ "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
+ without prior written permission of the Visigoth Software Society.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ VISIGOTH SOFTWARE SOCIETY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install
===================================================================
--- trunk/libfreemarker-java/debian/libfreemarker-java-doc.install 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,2 +0,0 @@
-build/api /usr/share/doc/libfreemarker-java/
-README.txt /usr/share/doc/libfreemarker-java/
Copied: tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install (from rev 14997, trunk/libfreemarker-java/debian/libfreemarker-java-doc.install)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/libfreemarker-java-doc.install 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,2 @@
+README.txt /usr/share/doc/libfreemarker-java/
+build/api /usr/share/doc/libfreemarker-java/
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,23 +0,0 @@
-Description: Link the javadoc against the system javadoc.
-Author: Niels Thykier <niels at thykier.net>
-
---- a/build.xml 2010-03-27 00:15:23.231497299 +0100
-+++ b/build.xml 2010-03-27 00:15:01.651506989 +0100
-@@ -407,6 +407,17 @@
- 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.18-1/debian/patches/def-jdk-doc.patch (from rev 14997, trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/def-jdk-doc.patch 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,25 @@
+Description: Link the javadoc against the system javadoc.
+Author: Niels Thykier <niels at thykier.net>
+
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -446,6 +446,17 @@
+ windowtitle="FreeMarker ${version} API"
+ classpathref="compile.classpath.javadoc"
+ use="${javadoc.use}">
++ <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>
+
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,113 +0,0 @@
-From ecec63b55bf12bef19b2b316071d065b068746ea Mon Sep 17 00:00:00 2001
-From: Torsten Werner <twerner at debian.org>
-Date: Wed, 4 Aug 2010 03:02:05 +0200
-Subject: [PATCH] disable jython extension
-
-Freemarker 2.3.16 fails to build against jython 2.5 because the PyJavaInstance
-class has been removed. See
-<https://sourceforge.net/tracker/index.php?func=detail&aid=2831150&group_id=794&atid=100794>
-for the upstream bug.
----
- build.xml | 1 -
- src/freemarker/ext/jython/JythonHashModel.java | 4 +-
- src/freemarker/ext/jython/JythonModelCache.java | 45 +----------------------
- 3 files changed, 3 insertions(+), 47 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 25c5328..bb5631a 100644
---- a/build.xml
-+++ b/build.xml
-@@ -513,7 +513,6 @@ Version: $Id: build.xml,v 1.138.2.4 2006/12/27 16:11:23 szegedia Exp $
- <antcall target="compile-logkit"/>
- <antcall target="compile-jdk14"/>
- <antcall target="compile-jdk15"/>
-- <antcall target="compile-jython"/>
- <antcall target="compile-dom4j"/>
- <antcall target="compile-jdom"/>
- <antcall target="compile-xalan"/>
-diff --git a/src/freemarker/ext/jython/JythonHashModel.java b/src/freemarker/ext/jython/JythonHashModel.java
-index f6ea9d3..1104bb8 100644
---- a/src/freemarker/ext/jython/JythonHashModel.java
-+++ b/src/freemarker/ext/jython/JythonHashModel.java
-@@ -137,7 +137,7 @@ implements
- {
- throw new TemplateModelException(e);
- }
-- throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType().getFullName());
-+ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute");
- }
-
- /**
-@@ -157,6 +157,6 @@ implements
- {
- throw new TemplateModelException(e);
- }
-- throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType().getFullName());
-+ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute");
- }
- }
-diff --git a/src/freemarker/ext/jython/JythonModelCache.java b/src/freemarker/ext/jython/JythonModelCache.java
-index 9d29ca5..e506e9f 100644
---- a/src/freemarker/ext/jython/JythonModelCache.java
-+++ b/src/freemarker/ext/jython/JythonModelCache.java
-@@ -10,7 +10,6 @@ import org.python.core.Py;
- import org.python.core.PyDictionary;
- import org.python.core.PyFloat;
- import org.python.core.PyInteger;
--import org.python.core.PyJavaInstance;
- import org.python.core.PyLong;
- import org.python.core.PyNone;
- import org.python.core.PyObject;
-@@ -35,48 +34,6 @@ class JythonModelCache extends ModelCache
- }
-
- protected TemplateModel create(Object obj) {
-- boolean asHash = false;
-- boolean asSequence = false;
-- if(obj instanceof PyJavaInstance) {
-- Object jobj = ((PyJavaInstance)obj).__tojava__(java.lang.Object.class);
-- // FreeMarker-aware, Jython-wrapped Java objects are left intact
-- if(jobj instanceof TemplateModel) {
-- return (TemplateModel)jobj;
-- }
-- if(jobj instanceof Map) {
-- asHash = true;
-- }
-- if (jobj instanceof Date) {
-- return new DateModel((Date) jobj, BeansWrapper.getDefaultInstance());
-- }
-- else if(jobj instanceof Collection) {
-- asSequence = true;
-- // FIXME: This is an ugly hack, but AFAIK, there's no better
-- // solution if we want to have Sets and other non-List
-- // collections managed by this layer, as Jython quite clearly
-- // doesn't support sets.
-- if(!(jobj instanceof List)) {
-- obj = new ArrayList((Collection)jobj);
-- }
-- }
-- }
--
-- // If it's not a PyObject, first make a PyObject out of it.
-- if(!(obj instanceof PyObject)) {
-- obj = Py.java2py(obj);
-- }
-- if(asHash || obj instanceof PyDictionary || obj instanceof PyStringMap) {
-- return JythonHashModel.FACTORY.create(obj, wrapper);
-- }
-- if(asSequence || obj instanceof PySequence) {
-- return JythonSequenceModel.FACTORY.create(obj, wrapper);
-- }
-- if(obj instanceof PyInteger || obj instanceof PyLong || obj instanceof PyFloat) {
-- return JythonNumberModel.FACTORY.create(obj, wrapper);
-- }
-- if(obj instanceof PyNone) {
-- return null;
-- }
-- return JythonModel.FACTORY.create(obj, wrapper);
-+ throw new RuntimeException("Jython support is broken!");
- }
- }
---
-1.7.1
-
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch (from rev 14997, trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/disable-jython-extension.patch 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,110 @@
+From ecec63b55bf12bef19b2b316071d065b068746ea Mon Sep 17 00:00:00 2001
+From: Torsten Werner <twerner at debian.org>
+Date: Wed, 4 Aug 2010 03:02:05 +0200
+Subject: [PATCH] disable jython extension
+
+Freemarker 2.3.16 fails to build against jython 2.5 because the PyJavaInstance
+class has been removed. See
+<https://sourceforge.net/tracker/index.php?func=detail&aid=2831150&group_id=794&atid=100794>
+for the upstream bug.
+---
+ build.xml | 1 -
+ src/freemarker/ext/jython/JythonHashModel.java | 4 +-
+ src/freemarker/ext/jython/JythonModelCache.java | 45 +----------------------
+ 3 files changed, 3 insertions(+), 47 deletions(-)
+
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -554,7 +554,6 @@
+ <antcall target="compile-commons-logging"/>
+ <antcall target="compile-jdk14"/>
+ <antcall target="compile-jdk15"/>
+- <antcall target="compile-jython"/>
+ <antcall target="compile-dom4j"/>
+ <antcall target="compile-jdom"/>
+ <antcall target="compile-xalan"/>
+Index: b/src/freemarker/ext/jython/JythonHashModel.java
+===================================================================
+--- a/src/freemarker/ext/jython/JythonHashModel.java
++++ b/src/freemarker/ext/jython/JythonHashModel.java
+@@ -137,7 +137,7 @@
+ {
+ throw new TemplateModelException(e);
+ }
+- throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType().getFullName());
++ throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute");
+ }
+
+ /**
+@@ -157,6 +157,6 @@
+ {
+ throw new TemplateModelException(e);
+ }
+- throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType().getFullName());
++ throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute");
+ }
+ }
+Index: b/src/freemarker/ext/jython/JythonModelCache.java
+===================================================================
+--- a/src/freemarker/ext/jython/JythonModelCache.java
++++ b/src/freemarker/ext/jython/JythonModelCache.java
+@@ -10,7 +10,6 @@
+ import org.python.core.PyDictionary;
+ import org.python.core.PyFloat;
+ import org.python.core.PyInteger;
+-import org.python.core.PyJavaInstance;
+ import org.python.core.PyLong;
+ import org.python.core.PyNone;
+ import org.python.core.PyObject;
+@@ -35,48 +34,6 @@
+ }
+
+ protected TemplateModel create(Object obj) {
+- boolean asHash = false;
+- boolean asSequence = false;
+- if(obj instanceof PyJavaInstance) {
+- Object jobj = ((PyJavaInstance)obj).__tojava__(java.lang.Object.class);
+- // FreeMarker-aware, Jython-wrapped Java objects are left intact
+- if(jobj instanceof TemplateModel) {
+- return (TemplateModel)jobj;
+- }
+- if(jobj instanceof Map) {
+- asHash = true;
+- }
+- if (jobj instanceof Date) {
+- return new DateModel((Date) jobj, BeansWrapper.getDefaultInstance());
+- }
+- else if(jobj instanceof Collection) {
+- asSequence = true;
+- // FIXME: This is an ugly hack, but AFAIK, there's no better
+- // solution if we want to have Sets and other non-List
+- // collections managed by this layer, as Jython quite clearly
+- // doesn't support sets.
+- if(!(jobj instanceof List)) {
+- obj = new ArrayList((Collection)jobj);
+- }
+- }
+- }
+-
+- // If it's not a PyObject, first make a PyObject out of it.
+- if(!(obj instanceof PyObject)) {
+- obj = Py.java2py(obj);
+- }
+- if(asHash || obj instanceof PyDictionary || obj instanceof PyStringMap) {
+- return JythonHashModel.FACTORY.create(obj, wrapper);
+- }
+- if(asSequence || obj instanceof PySequence) {
+- return JythonSequenceModel.FACTORY.create(obj, wrapper);
+- }
+- if(obj instanceof PyInteger || obj instanceof PyLong || obj instanceof PyFloat) {
+- return JythonNumberModel.FACTORY.create(obj, wrapper);
+- }
+- if(obj instanceof PyNone) {
+- return null;
+- }
+- return JythonModel.FACTORY.create(obj, wrapper);
++ throw new RuntimeException("Jython support is broken!");
+ }
+ }
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/dtd_location.diff (from rev 15001, trunk/libfreemarker-java/debian/patches/dtd_location.diff)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/dtd_location.diff (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/dtd_location.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,50 @@
+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)
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc.diff 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,23 +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
-@@ -427,7 +427,6 @@
- description="Build the JavaCC parser from its grammar file">
- <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
- uri="http://javacc.dev.java.net/"
-- classpath="lib/javacc.jar"
- />
-
- <!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ -->
-@@ -435,7 +434,7 @@
- <javacc:generate
- target="${src.dir}/freemarker/core/FMParser.jj"
- outputdirectory="src/freemarker/core"
-- javacchome="lib"
-+ javacchome="/usr/share/java/" jdkversion="1.3"
- />
- <replace
- file="src/freemarker/core/FMParser.java"
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff (from rev 14997, trunk/libfreemarker-java/debian/patches/javacc.diff)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/javacc.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,25 @@
+Description: Use JavaCC from Debian
+Forwarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-09-27
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -466,7 +466,6 @@
+ description="Build the JavaCC parser from its grammar file">
+ <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
+ uri="http://javacc.dev.java.net/"
+- classpath="lib/javacc.jar"
+ />
+
+ <!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ -->
+@@ -474,7 +473,7 @@
+ <javacc:generate
+ target="${src.dir}/freemarker/core/FMParser.jj"
+ outputdirectory="src/freemarker/core"
+- javacchome="lib"
++ javacchome="/usr/share/java/" jdkversion="1.3"
+ />
+ <replace
+ file="src/freemarker/core/FMParser.java"
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javarebel.diff 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,38 +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/src/freemarker/ext/beans/BeansWrapper.java
-+++ b/src/freemarker/ext/beans/BeansWrapper.java
-@@ -232,7 +232,6 @@
- */
- public BeansWrapper() {
- if(javaRebelAvailable) {
-- JavaRebelIntegration.registerWrapper(this);
- }
- }
-
-@@ -1566,12 +1565,6 @@
-
-
- private static boolean isJavaRebelAvailable() {
-- try {
-- JavaRebelIntegration.testAvailability();
-- return true;
-- }
-- catch(NoClassDefFoundError e) {
- return false;
-- }
- }
- }
---- a/build.xml
-+++ b/build.xml
-@@ -151,6 +151,7 @@
- <exclude name="freemarker/core/RegexBuiltins.java"/>
- <exclude name="freemarker/ext/ant/**"/>
- <exclude name="freemarker/ext/beans/EnumModels.java"/>
-+ <exclude name="freemarker/ext/beans/JavaRebelIntegration.java"/>
- <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
- <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
- <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff (from rev 14997, trunk/libfreemarker-java/debian/patches/javarebel.diff)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/javarebel.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,43 @@
+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
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -162,6 +162,7 @@
+ <exclude name="freemarker/core/RegexBuiltins.java"/>
+ <exclude name="freemarker/ext/ant/**"/>
+ <exclude name="freemarker/ext/beans/EnumModels.java"/>
++ <exclude name="freemarker/ext/beans/JavaRebelIntegration.java"/>
+ <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
+ <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
+ <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
+Index: b/src/freemarker/ext/beans/BeansWrapper.java
+===================================================================
+--- a/src/freemarker/ext/beans/BeansWrapper.java
++++ b/src/freemarker/ext/beans/BeansWrapper.java
+@@ -232,7 +232,6 @@
+ */
+ public BeansWrapper() {
+ if(javaRebelAvailable) {
+- JavaRebelIntegration.registerWrapper(this);
+ }
+ }
+
+@@ -1674,13 +1673,7 @@
+
+
+ private static boolean isJavaRebelAvailable() {
+- try {
+- JavaRebelIntegration.testAvailability();
+- return true;
+- }
+- catch(NoClassDefFoundError e) {
+ return false;
+- }
+ }
+
+ /**
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp_api.diff 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -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
-@@ -83,8 +83,6 @@
- </path>
-
- <path id="compile.jsp1.classpath">
-- <path refid="compile.nojsp.classpath"/>
-- <pathelement path="${lib.jsp12}"/>
- </path>
-
- <path id="compile.jsp2.classpath">
-@@ -223,7 +221,6 @@
- </patternset>
-
- <patternset id="freemarker.compile.jsp1">
-- <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
- </patternset>
-
- <patternset id="freemarker.compile.jsp2">
-@@ -505,8 +502,6 @@
- <antcall target="compile-logkit"/>
- <antcall target="compile-jdk14"/>
- <antcall target="compile-jdk15"/>
-- <antcall target="compile-jsp1"/>
-- <antcall target="compile-jsp2"/>
- <antcall target="compile-jython"/>
- <antcall target="compile-dom4j"/>
- <antcall target="compile-jdom"/>
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff (from rev 14997, trunk/libfreemarker-java/debian/patches/jsp_api.diff)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/jsp_api.diff 2011-09-22 13:14:57 UTC (rev 15002)
@@ -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
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -89,8 +89,6 @@
+ </path>
+
+ <path id="compile.jsp1.classpath">
+- <path refid="compile.nojsp.classpath"/>
+- <pathelement path="${lib.jsp12}"/>
+ </path>
+
+ <path id="compile.jsp2.classpath">
+@@ -244,7 +242,6 @@
+
+ <patternset id="freemarker.compile.jsp1">
+ <include name="freemarker/ext/jsp/TaglibFactory.java"/>
+- <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
+ </patternset>
+
+ <patternset id="freemarker.compile.jsp2">
+@@ -546,8 +543,6 @@
+ <antcall target="compile-commons-logging"/>
+ <antcall target="compile-jdk14"/>
+ <antcall target="compile-jdk15"/>
+- <antcall target="compile-jsp1"/>
+- <antcall target="compile-jsp2"/>
+ <antcall target="compile-jython"/>
+ <antcall target="compile-dom4j"/>
+ <antcall target="compile-jdom"/>
Deleted: tags/libfreemarker-java/2.3.18-1/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/series 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,7 +0,0 @@
-class_name.diff
-javarebel.diff
-jdom1.diff
-javacc.diff
-jsp_api.diff
-def-jdk-doc.patch
-disable-jython-extension.patch
Copied: tags/libfreemarker-java/2.3.18-1/debian/patches/series (from rev 15001, trunk/libfreemarker-java/debian/patches/series)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/patches/series (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/patches/series 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,8 @@
+class_name.diff
+javarebel.diff
+jdom1.diff
+javacc.diff
+jsp_api.diff
+def-jdk-doc.patch
+disable-jython-extension.patch
+dtd_location.diff
Deleted: tags/libfreemarker-java/2.3.18-1/debian/pom.xml
===================================================================
--- trunk/libfreemarker-java/debian/pom.xml 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/pom.xml 2011-09-22 13:14:57 UTC (rev 15002)
@@ -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.16</version>
- <packaging>jar</packaging>
- <name>FreeMarker</name>
- <description>
- FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
- </description>
- <url>http://freemarker.org</url>
- <licenses>
- <license>
- <name>BSD-style license</name>
- <url>http://freemarker.org/LICENSE.txt</url>
- </license>
- </licenses>
- <scm>
- <url>http://freemarker.svn.sourceforge.net/viewvc/freemarker/</url>
- <connection>scm:svn:https://freemarker.svn.sourceforge.net/svnroot/freemarker</connection>
- </scm>
- <dependencies>
- <!-- no required dependencies -->
- </dependencies>
- </project>
-
\ No newline at end of file
Copied: tags/libfreemarker-java/2.3.18-1/debian/pom.xml (from rev 14997, trunk/libfreemarker-java/debian/pom.xml)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/pom.xml (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/pom.xml 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</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
Deleted: tags/libfreemarker-java/2.3.18-1/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2011-09-22 05:47:07 UTC (rev 14995)
+++ tags/libfreemarker-java/2.3.18-1/debian/rules 2011-09-22 13:14:57 UTC (rev 15002)
@@ -1,26 +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.16
-MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_ANT_BUILD_TARGET := javacc jar javadoc
-DEB_ANT_CHECK_TARGET := test
-
-DEB_JARS := ant-nodeps dom4j servlet-api-2.5 el-api-2.1 jsp-api-2.1 jaxen jdom1 js junit \
- jython log4j-1.2 excalibur-logkit xercesImpl jsp-api xalan2 commons-jxpath ant-junit
-
-install/libfreemarker-java::
- mh_installpoms -plibfreemarker-java
- mh_installjar -plibfreemarker-java -l debian/pom.xml lib/freemarker.jar
-
-get-orig-source:
- uscan --force-download --rename
-
-get-orig-pom:
- wget -O debian/pom.xml $(MAVEN_REPO)/org/freemarker/freemarker/$(POM_VERSION)/freemarker-$(POM_VERSION).pom
- perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/pom.xml
Copied: tags/libfreemarker-java/2.3.18-1/debian/rules (from rev 14997, trunk/libfreemarker-java/debian/rules)
===================================================================
--- tags/libfreemarker-java/2.3.18-1/debian/rules (rev 0)
+++ tags/libfreemarker-java/2.3.18-1/debian/rules 2011-09-22 13:14:57 UTC (rev 15002)
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+POM_VERSION := 2.3.18
+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
+
+get-orig-source:
+ uscan --force-download --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