This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1 in repository glassfish.
commit 89949c9f0b6f7feea17362edf8be7c01897de501 Author: Varun Hiremath <[email protected]> Date: Thu Feb 18 03:55:54 2010 +0000 * 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) --- debian/changelog | 14 ++++++++++++++ debian/compat | 2 +- debian/control | 22 +++++++++++----------- debian/glassfish-appserv.install | 3 ++- debian/glassfish-javaee.install | 1 + debian/patches/appserv.diff | 18 ++++++++++++++++++ debian/patches/jstl.diff | 6 +++--- debian/patches/properties.diff | 8 ++++---- debian/patches/series | 2 ++ debian/rules | 7 +++---- debian/source/format | 1 + debian/watch | 1 - 12 files changed, 60 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2552cbe..da611e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 ] diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index fddbc16..2c5140b 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,18 @@ Source: glassfish -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), quilt -Build-Depends-Indep: ant, openjdk-6-jdk, libaxis-java -Standards-Version: 3.8.2 +Build-Depends: cdbs, debhelper (>= 7) +Build-Depends-Indep: ant, default-jdk, libaxis-java +Standards-Version: 3.8.4 Homepage: https://glassfish.dev.java.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/glassfish Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/glassfish #Package: glassfish #Architecture: all -#Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime +#Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime #Description: Open source Java EE 5 Application Server # The GlassFish community is building free, open source, # production-quality, enterprise software. The main deliverables are an @@ -21,7 +21,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/glassfish Package: glassfish-activation Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an @@ -32,7 +32,7 @@ Description: Open source Java EE 5 Application Server Package: glassfish-appserv Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an @@ -43,7 +43,7 @@ Description: Open source Java EE 5 Application Server Package: glassfish-jmac-api Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an @@ -54,7 +54,7 @@ Description: Open source Java EE 5 Application Server Package: glassfish-mail Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an @@ -65,7 +65,7 @@ Description: Open source Java EE 5 Application Server Package: glassfish-javaee Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an @@ -77,7 +77,7 @@ Description: Open source Java EE 5 Application Server Package: glassfish-toplink-essentials Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime Description: Open source Java EE 5 Application Server The GlassFish community is building free, open source, production-quality, enterprise software. The main deliverables are an diff --git a/debian/glassfish-appserv.install b/debian/glassfish-appserv.install index b4cd232..d6b18bd 100644 --- a/debian/glassfish-appserv.install +++ b/debian/glassfish-appserv.install @@ -1 +1,2 @@ -debian/tmp/usr/share/java/glassfish-appserv* +debian/tmp/usr/share/java/glassfish-appserv-rt* +debian/tmp/usr/share/java/glassfish-appserv-ext* diff --git a/debian/glassfish-javaee.install b/debian/glassfish-javaee.install index fe3bf82..92d6117 100644 --- a/debian/glassfish-javaee.install +++ b/debian/glassfish-javaee.install @@ -1,2 +1,3 @@ debian/tmp/usr/share/java/glassfish-javaee* debian/tmp/usr/share/java/glassfish-ejb-api* +debian/tmp/usr/share/java/glassfish-appserv-jstl* diff --git a/debian/patches/appserv.diff b/debian/patches/appserv.diff new file mode 100644 index 0000000..d1aed11 --- /dev/null +++ b/debian/patches/appserv.diff @@ -0,0 +1,18 @@ +Description: Fix appserv-api build +Index: glassfish-2ur2-b04/appserv-api/build.xml +=================================================================== +--- glassfish-2ur2-b04.orig/appserv-api/build.xml 2010-02-17 22:42:49.000000000 -0500 ++++ glassfish-2ur2-b04/appserv-api/build.xml 2010-02-17 22:44:55.000000000 -0500 +@@ -86,9 +86,10 @@ + source="${javac.source}" + deprecation="${javac.deprecation}" + failonerror="true"> +- <classpath refid="compile.classpath"/> ++ <classpath> ++ <pathelement location="${javaee.jar}"/> ++ </classpath> + <include name="**/*.java"/> +- <compilerarg line="-Xlint:unchecked,fallthrough,serial,finally"/> + </javac> + </target> + diff --git a/debian/patches/jstl.diff b/debian/patches/jstl.diff index 3607627..ca50486 100644 --- a/debian/patches/jstl.diff +++ b/debian/patches/jstl.diff @@ -1,8 +1,8 @@ Description: Disable SQL exceptions. -Index: glassfish-2+b58g/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +Index: glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java =================================================================== ---- glassfish-2+b58g.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2007-12-18 13:15:27.000000000 +0100 -+++ glassfish-2+b58g/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2007-12-18 13:05:38.000000000 +0100 +--- glassfish-2ur2-b04.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2007-05-05 22:17:53.000000000 -0400 ++++ glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2010-02-17 22:26:45.000000000 -0500 @@ -133,5 +133,19 @@ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); } diff --git a/debian/patches/properties.diff b/debian/patches/properties.diff index 931958d..5fb4a13 100644 --- a/debian/patches/properties.diff +++ b/debian/patches/properties.diff @@ -1,10 +1,10 @@ Description: Fix glassfish.root directory -Index: glassfish-2+b58g/bootstrap/project.properties +Index: glassfish-2ur2-b04/bootstrap/project.properties =================================================================== ---- glassfish-2+b58g.orig/bootstrap/project.properties 2007-10-27 16:04:23.000000000 +0530 -+++ glassfish-2+b58g/bootstrap/project.properties 2007-10-27 16:05:43.000000000 +0530 +--- glassfish-2ur2-b04.orig/bootstrap/project.properties 2008-04-11 12:55:29.000000000 -0400 ++++ glassfish-2ur2-b04/bootstrap/project.properties 2010-02-17 22:26:38.000000000 -0500 @@ -46,8 +46,8 @@ - glassfish.cvstag=SJSAS91_FCS_BRANCH + glassfish.cvstag=SJSAS91_UR2_BRANCH glassfish.cvs.project=glassfish glassfish.cvs.module=bootstrap -glassfish.root=${basedir}/../.. diff --git a/debian/patches/series b/debian/patches/series index b0272e0..96924ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ +appserv.diff properties.diff jstl.diff + diff --git a/debian/rules b/debian/rules index 44d39c8..71c8826 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,8 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := jar DEB_ANT_BUILDFILE := debian/build.xml DEB_DESTDIR := $(CURDIR)/debian/tmp @@ -14,8 +13,8 @@ ALL_JARS := $(wildcard publish/glassfish/lib/*.jar) ALL_JARS += $(wildcard */build/release/*.jar) DEST_DIR = $(DEB_DESTDIR)/usr/share/java -clean:: - rm -rf publish/glassfish +#clean:: +# rm -rf publish/glassfish common-install-prehook-indep:: for jar in $(ALL_JARS); do \ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 4c3d505..6c6a4cd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 - http://download.java.net/javaee5/v(2[[:digit:].]+)/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
