[pkg-java] r12850 - in tags/libfreemarker-java: . 2.3.16-3/debian 2.3.16-3/debian/patches
Torsten Werner
twerner at alioth.debian.org
Wed Aug 4 02:21:58 UTC 2010
Author: twerner
Date: 2010-08-04 02:21:57 +0000 (Wed, 04 Aug 2010)
New Revision: 12850
Added:
tags/libfreemarker-java/2.3.16-3/
tags/libfreemarker-java/2.3.16-3/debian/changelog
tags/libfreemarker-java/2.3.16-3/debian/control
tags/libfreemarker-java/2.3.16-3/debian/patches/disable-jython-extension.patch
tags/libfreemarker-java/2.3.16-3/debian/patches/series
Removed:
tags/libfreemarker-java/2.3.16-3/debian/changelog
tags/libfreemarker-java/2.3.16-3/debian/control
tags/libfreemarker-java/2.3.16-3/debian/patches/series
Log:
[svn-buildpackage] Tagging libfreemarker-java 2.3.16-3
Deleted: tags/libfreemarker-java/2.3.16-3/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2010-08-03 10:33:28 UTC (rev 12847)
+++ tags/libfreemarker-java/2.3.16-3/debian/changelog 2010-08-04 02:21:57 UTC (rev 12850)
@@ -1,175 +0,0 @@
-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.16-3/debian/changelog (from rev 12849, trunk/libfreemarker-java/debian/changelog)
===================================================================
--- tags/libfreemarker-java/2.3.16-3/debian/changelog (rev 0)
+++ tags/libfreemarker-java/2.3.16-3/debian/changelog 2010-08-04 02:21:57 UTC (rev 12850)
@@ -0,0 +1,183 @@
+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.16-3/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2010-08-03 10:33:28 UTC (rev 12847)
+++ tags/libfreemarker-java/2.3.16-3/debian/control 2010-08-04 02:21:57 UTC (rev 12850)
@@ -1,81 +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>,
- Paul Cager <paul-debian at home.paulcager.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, rhino,
- libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc,
- libdom4j-java-doc, rhino-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.8.4
-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: default-jre-headless | java2-runtime-headless |
- java5-runtime-headless | java6-runtime-headless,
- libservlet2.5-java,
- ${misc:Depends}
-Suggests: jython, rhino, 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,
- rhino-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.16-3/debian/control (from rev 12849, trunk/libfreemarker-java/debian/control)
===================================================================
--- tags/libfreemarker-java/2.3.16-3/debian/control (rev 0)
+++ tags/libfreemarker-java/2.3.16-3/debian/control 2010-08-04 02:21:57 UTC (rev 12850)
@@ -0,0 +1,81 @@
+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, rhino,
+ libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc,
+ libdom4j-java-doc, rhino-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.8.4
+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: default-jre-headless | java2-runtime-headless |
+ java5-runtime-headless | java6-runtime-headless,
+ libservlet2.5-java,
+ ${misc:Depends}
+Suggests: jython, rhino, 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,
+ rhino-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.16-3/debian/patches/disable-jython-extension.patch (from rev 12848, trunk/libfreemarker-java/debian/patches/disable-jython-extension.patch)
===================================================================
--- tags/libfreemarker-java/2.3.16-3/debian/patches/disable-jython-extension.patch (rev 0)
+++ tags/libfreemarker-java/2.3.16-3/debian/patches/disable-jython-extension.patch 2010-08-04 02:21:57 UTC (rev 12850)
@@ -0,0 +1,113 @@
+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
+
Deleted: tags/libfreemarker-java/2.3.16-3/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2010-08-03 10:33:28 UTC (rev 12847)
+++ tags/libfreemarker-java/2.3.16-3/debian/patches/series 2010-08-04 02:21:57 UTC (rev 12850)
@@ -1,6 +0,0 @@
-class_name.diff
-javarebel.diff
-jdom1.diff
-javacc.diff
-jsp_api.diff
-def-jdk-doc.patch
Copied: tags/libfreemarker-java/2.3.16-3/debian/patches/series (from rev 12848, trunk/libfreemarker-java/debian/patches/series)
===================================================================
--- tags/libfreemarker-java/2.3.16-3/debian/patches/series (rev 0)
+++ tags/libfreemarker-java/2.3.16-3/debian/patches/series 2010-08-04 02:21:57 UTC (rev 12850)
@@ -0,0 +1,7 @@
+class_name.diff
+javarebel.diff
+jdom1.diff
+javacc.diff
+jsp_api.diff
+def-jdk-doc.patch
+disable-jython-extension.patch
More information about the pkg-java-commits
mailing list