Author: drazzib Date: 2012-05-29 23:19:38 +0000 (Tue, 29 May 2012) New Revision: 16077
Added: tags/glassfish/1:2.1.1-b31g-3/ tags/glassfish/1:2.1.1-b31g-3/debian/changelog tags/glassfish/1:2.1.1-b31g-3/debian/patches/java7-compat.patch tags/glassfish/1:2.1.1-b31g-3/debian/patches/series Removed: tags/glassfish/1:2.1.1-b31g-3/debian/changelog tags/glassfish/1:2.1.1-b31g-3/debian/patches/series Log: [svn-buildpackage] Tagging glassfish 1:2.1.1-b31g-3 Deleted: tags/glassfish/1:2.1.1-b31g-3/debian/changelog =================================================================== --- trunk/glassfish/debian/changelog 2012-05-28 23:09:51 UTC (rev 16073) +++ tags/glassfish/1:2.1.1-b31g-3/debian/changelog 2012-05-29 23:19:38 UTC (rev 16077) @@ -1,125 +0,0 @@ -glassfish (1:2.1.1-b31g-2) unstable; urgency=low - - * Install POM and jar for Jmac API into maven-repo. - * Add myself to Uploaders. - * Bump Standards-Version to 3.9.3. - - -- Jakub Adam <[email protected]> Thu, 23 Feb 2012 23:25:45 +0100 - -glassfish (1:2.1.1-b31g-1) unstable; urgency=low - - * New upstream release. - * Add myself to Uploaders. - * d/control: - - Drop Depends on JRE since its only a library package. - - Drop ${shlibs:Depends} since we are building arch:all packages. - - Bump Standards-Version to 3.9.2: no changes needed. - - Fix typo in package description (Closes: #587617). - * Install POM and jar for Java EE API 5.0 at javax:javaee-api. - * d/copyright: Drop links to BSD common-licences. - - -- Damien Raude-Morvan <[email protected]> Tue, 24 May 2011 22:56:36 +0200 - -glassfish (1:2.1.1-b31-2) unstable; urgency=low - - * Install POM and jar for Java Messaging Service (JMS). - - -- Torsten Werner <[email protected]> Fri, 21 May 2010 09:51:10 +0200 - -glassfish (1:2.1.1-b31-1) unstable; urgency=low - - * New upstream release - * Update debian/watch for release 2.1.1. - * Convert patches to dep3 format. - * Invoke ant twice if the first execution fails. Remove the <sleep/> - workaround. - * Install some POM files. (Closes: #581885) - - -- Torsten Werner <[email protected]> Tue, 18 May 2010 21:31:25 +0200 - -glassfish (1:2ur2-b04-6) unstable; urgency=low - - * Increase sleep time to 20 seconds. (Closes: #574307) - - -- Torsten Werner <[email protected]> Wed, 17 Mar 2010 23:03:52 +0100 - -glassfish (1:2ur2-b04-5) unstable; urgency=low - - * Add an extra <sleep /> before line 62 in debian/build.xml as we had in the - past. (Closes: #571403) - - -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 13:28:59 +0100 - -glassfish (1:2ur2-b04-4) unstable; urgency=low - - * debian/control: - - Switch to default-jdk - - Bump Standards-Version to 3.8.4 - - Bump dh_compat to 7 - - Change Section to java - * Add patches/appserv.diff, fixes FTBFS (Closes: #564365) - * Switch to source format 3.0 (quilt) - * Move glassfish-appserv-jstl.jar from glassfish-appserv - to glassfish-javaee (Closes: #548242) - - -- Varun Hiremath <[email protected]> Wed, 17 Feb 2010 22:48:12 -0500 - -glassfish (1:2ur2-b04-3) unstable; urgency=low - - [ Torsten Werner ] - * Change watch file to stay with major version 2. - - [ Varun Hiremath ] - * Change build order in debian/build.xml, fixes FTBFS (Closes: #533461) - * Bump Standards-Version to 3.8.2 - - -- Varun Hiremath <[email protected]> Thu, 25 Jun 2009 21:33:41 -0400 - -glassfish (1:2ur2-b04-2) unstable; urgency=low - - merge changes from Lenny: - * Fix java runtime Depends. (Closes: #503775) - - -- Torsten Werner <[email protected]> Thu, 06 Nov 2008 22:00:12 +0100 - -glassfish (1:2ur2-b04-1) unstable; urgency=low - - * new upstream release - * Update debian/watch to be more flexible. - * Set build.sysclasspath=first in debian/ant.properties. - * Increase the <sleep/> introduced with the last upload. - - -- Torsten Werner <[email protected]> Sun, 31 Aug 2008 15:53:28 +0200 - -glassfish (2+b58g-4) unstable; urgency=low - - * Switch to openjdk-6. - * Move package to main. - * Add a <sleep/> in debian/build.xml because of a strange race condition. - * Bump up Standards-Version: 3.8.0 (no changes needed). - * Update debian/watch for the current upstream version without actually - upgrading to this version yet. - - -- Torsten Werner <[email protected]> Tue, 12 Aug 2008 00:59:02 +0200 - -glassfish (2+b58g-3) unstable; urgency=low - - * Build directory servlet-api to make javaee more complete. - * Remove Build-Depends: libservlet2.4-java. - * Add Build-Depends: libaxis-java and remove wrong patch ejb.diff. - * Change Standards-Version: 3.7.3. - * Build appserv-jstl. - - -- Torsten Werner <[email protected]> Tue, 18 Dec 2007 13:16:37 +0100 - -glassfish (2+b58g-2) unstable; urgency=low - - * glassfish-javaee: Build and install ejb-api too. - - -- Torsten Werner <[email protected]> Fri, 02 Nov 2007 17:54:59 +0100 - -glassfish (2+b58g-1) unstable; urgency=low - - * Initial release (Closes: #448509) - - -- Varun Hiremath <[email protected]> Tue, 24 Apr 2007 17:19:10 +0530 Copied: tags/glassfish/1:2.1.1-b31g-3/debian/changelog (from rev 16076, trunk/glassfish/debian/changelog) =================================================================== --- tags/glassfish/1:2.1.1-b31g-3/debian/changelog (rev 0) +++ tags/glassfish/1:2.1.1-b31g-3/debian/changelog 2012-05-29 23:19:38 UTC (rev 16077) @@ -0,0 +1,137 @@ +glassfish (1:2.1.1-b31g-3) unstable; urgency=low + + [ James Page ] + * Fix FTBFS with openjdk-7 as default-jdk (LP: #888938): + - d/patches/java7-compat.patch: compatibility patch for compilation + with Java 7 API's. (Closes: #675038). + + [ Damien Raude-Morvan ] + * Upload to unstable. + + -- Damien Raude-Morvan <[email protected]> Wed, 30 May 2012 01:07:41 +0200 + +glassfish (1:2.1.1-b31g-2) unstable; urgency=low + + * Install POM and jar for Jmac API into maven-repo. + * Add myself to Uploaders. + * Bump Standards-Version to 3.9.3. + + -- Jakub Adam <[email protected]> Thu, 23 Feb 2012 23:25:45 +0100 + +glassfish (1:2.1.1-b31g-1) unstable; urgency=low + + * New upstream release. + * Add myself to Uploaders. + * d/control: + - Drop Depends on JRE since its only a library package. + - Drop ${shlibs:Depends} since we are building arch:all packages. + - Bump Standards-Version to 3.9.2: no changes needed. + - Fix typo in package description (Closes: #587617). + * Install POM and jar for Java EE API 5.0 at javax:javaee-api. + * d/copyright: Drop links to BSD common-licences. + + -- Damien Raude-Morvan <[email protected]> Tue, 24 May 2011 22:56:36 +0200 + +glassfish (1:2.1.1-b31-2) unstable; urgency=low + + * Install POM and jar for Java Messaging Service (JMS). + + -- Torsten Werner <[email protected]> Fri, 21 May 2010 09:51:10 +0200 + +glassfish (1:2.1.1-b31-1) unstable; urgency=low + + * New upstream release + * Update debian/watch for release 2.1.1. + * Convert patches to dep3 format. + * Invoke ant twice if the first execution fails. Remove the <sleep/> + workaround. + * Install some POM files. (Closes: #581885) + + -- Torsten Werner <[email protected]> Tue, 18 May 2010 21:31:25 +0200 + +glassfish (1:2ur2-b04-6) unstable; urgency=low + + * Increase sleep time to 20 seconds. (Closes: #574307) + + -- Torsten Werner <[email protected]> Wed, 17 Mar 2010 23:03:52 +0100 + +glassfish (1:2ur2-b04-5) unstable; urgency=low + + * Add an extra <sleep /> before line 62 in debian/build.xml as we had in the + past. (Closes: #571403) + + -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 13:28:59 +0100 + +glassfish (1:2ur2-b04-4) unstable; urgency=low + + * debian/control: + - Switch to default-jdk + - Bump Standards-Version to 3.8.4 + - Bump dh_compat to 7 + - Change Section to java + * Add patches/appserv.diff, fixes FTBFS (Closes: #564365) + * Switch to source format 3.0 (quilt) + * Move glassfish-appserv-jstl.jar from glassfish-appserv + to glassfish-javaee (Closes: #548242) + + -- Varun Hiremath <[email protected]> Wed, 17 Feb 2010 22:48:12 -0500 + +glassfish (1:2ur2-b04-3) unstable; urgency=low + + [ Torsten Werner ] + * Change watch file to stay with major version 2. + + [ Varun Hiremath ] + * Change build order in debian/build.xml, fixes FTBFS (Closes: #533461) + * Bump Standards-Version to 3.8.2 + + -- Varun Hiremath <[email protected]> Thu, 25 Jun 2009 21:33:41 -0400 + +glassfish (1:2ur2-b04-2) unstable; urgency=low + + merge changes from Lenny: + * Fix java runtime Depends. (Closes: #503775) + + -- Torsten Werner <[email protected]> Thu, 06 Nov 2008 22:00:12 +0100 + +glassfish (1:2ur2-b04-1) unstable; urgency=low + + * new upstream release + * Update debian/watch to be more flexible. + * Set build.sysclasspath=first in debian/ant.properties. + * Increase the <sleep/> introduced with the last upload. + + -- Torsten Werner <[email protected]> Sun, 31 Aug 2008 15:53:28 +0200 + +glassfish (2+b58g-4) unstable; urgency=low + + * Switch to openjdk-6. + * Move package to main. + * Add a <sleep/> in debian/build.xml because of a strange race condition. + * Bump up Standards-Version: 3.8.0 (no changes needed). + * Update debian/watch for the current upstream version without actually + upgrading to this version yet. + + -- Torsten Werner <[email protected]> Tue, 12 Aug 2008 00:59:02 +0200 + +glassfish (2+b58g-3) unstable; urgency=low + + * Build directory servlet-api to make javaee more complete. + * Remove Build-Depends: libservlet2.4-java. + * Add Build-Depends: libaxis-java and remove wrong patch ejb.diff. + * Change Standards-Version: 3.7.3. + * Build appserv-jstl. + + -- Torsten Werner <[email protected]> Tue, 18 Dec 2007 13:16:37 +0100 + +glassfish (2+b58g-2) unstable; urgency=low + + * glassfish-javaee: Build and install ejb-api too. + + -- Torsten Werner <[email protected]> Fri, 02 Nov 2007 17:54:59 +0100 + +glassfish (2+b58g-1) unstable; urgency=low + + * Initial release (Closes: #448509) + + -- Varun Hiremath <[email protected]> Tue, 24 Apr 2007 17:19:10 +0530 Copied: tags/glassfish/1:2.1.1-b31g-3/debian/patches/java7-compat.patch (from rev 16076, trunk/glassfish/debian/patches/java7-compat.patch) =================================================================== --- tags/glassfish/1:2.1.1-b31g-3/debian/patches/java7-compat.patch (rev 0) +++ tags/glassfish/1:2.1.1-b31g-3/debian/patches/java7-compat.patch 2012-05-29 23:19:38 UTC (rev 16077) @@ -0,0 +1,58 @@ +Description: Compatibility patch for compilation with OpenJDK7 due + to changes in the JDBC API. + . + Also backwards compatibility with OpenJDK6. +Author: James Page <[email protected]> +Forwarded: no + +Index: glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java +=================================================================== +--- glassfish.orig/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java 2012-05-29 13:10:41.666234000 +0100 ++++ glassfish/entity-persistence/src/java/oracle/toplink/essentials/internal/ejb/cmp3/jdbc/base/DataSourceImpl.java 2012-05-29 13:15:35.752552327 +0100 +@@ -40,6 +40,8 @@ + import java.sql.Connection; + import java.sql.SQLException; + import java.sql.DriverManager; ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + import javax.sql.DataSource; + import oracle.toplink.essentials.internal.ejb.cmp3.transaction.base.TransactionManagerImpl; + +@@ -177,4 +179,11 @@ + public boolean isWrapperFor(Class<?> iface) throws SQLException { + return false; + } ++ ++ /* ++ * JDBC 4.1 ++ */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +Index: glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +=================================================================== +--- glassfish.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-05-29 13:10:41.666234000 +0100 ++++ glassfish/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-05-29 13:27:43.078925227 +0100 +@@ -58,7 +58,8 @@ + import java.sql.Connection; + import java.sql.DriverManager; + import java.sql.SQLException; +- ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + import javax.sql.DataSource; + + import org.apache.taglibs.standard.resources.Resources; +@@ -163,5 +164,10 @@ + throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); + } + +- ++ /* ++ * JDBC 4.1 ++ */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } Deleted: tags/glassfish/1:2.1.1-b31g-3/debian/patches/series =================================================================== --- trunk/glassfish/debian/patches/series 2012-05-28 23:09:51 UTC (rev 16073) +++ tags/glassfish/1:2.1.1-b31g-3/debian/patches/series 2012-05-29 23:19:38 UTC (rev 16077) @@ -1,3 +0,0 @@ -0001-Fix-appserv-api-build.patch -0002-Fix-glassfish.root-directory.patch -0003-Disable-SQL-exceptions.patch Copied: tags/glassfish/1:2.1.1-b31g-3/debian/patches/series (from rev 16076, trunk/glassfish/debian/patches/series) =================================================================== --- tags/glassfish/1:2.1.1-b31g-3/debian/patches/series (rev 0) +++ tags/glassfish/1:2.1.1-b31g-3/debian/patches/series 2012-05-29 23:19:38 UTC (rev 16077) @@ -0,0 +1,4 @@ +0001-Fix-appserv-api-build.patch +0002-Fix-glassfish.root-directory.patch +0003-Disable-SQL-exceptions.patch +java7-compat.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
