[pkg-java] r11621 - in trunk/glassfish/debian: . patches source

Varun Hiremath varun at alioth.debian.org
Thu Feb 18 03:55:54 UTC 2010 

Author: varun
Date: 2010-02-18 03:55:54 +0000 (Thu, 18 Feb 2010)
New Revision: 11621

Added:
   trunk/glassfish/debian/patches/appserv.diff
   trunk/glassfish/debian/source/
   trunk/glassfish/debian/source/format
Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/compat
   trunk/glassfish/debian/control
   trunk/glassfish/debian/glassfish-appserv.install
   trunk/glassfish/debian/glassfish-javaee.install
   trunk/glassfish/debian/patches/jstl.diff
   trunk/glassfish/debian/patches/properties.diff
   trunk/glassfish/debian/patches/series
   trunk/glassfish/debian/rules
   trunk/glassfish/debian/watch
Log:
* 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)

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/changelog	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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 <varun at debian.org>  Wed, 17 Feb 2010 22:48:12 -0500
+
 glassfish (1:2ur2-b04-3) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/glassfish/debian/compat
===================================================================
--- trunk/glassfish/debian/compat	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/compat	2010-02-18 03:55:54 UTC (rev 11621)
@@ -1 +1 @@
-5
+7

Modified: trunk/glassfish/debian/control
===================================================================
--- trunk/glassfish/debian/control	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/control	2010-02-18 03:55:54 UTC (rev 11621)
@@ -1,18 +1,18 @@
 Source: glassfish
-Section: libs
+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>
-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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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

Modified: trunk/glassfish/debian/glassfish-appserv.install
===================================================================
--- trunk/glassfish/debian/glassfish-appserv.install	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/glassfish-appserv.install	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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*

Modified: trunk/glassfish/debian/glassfish-javaee.install
===================================================================
--- trunk/glassfish/debian/glassfish-javaee.install	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/glassfish-javaee.install	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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*

Added: trunk/glassfish/debian/patches/appserv.diff
===================================================================
--- trunk/glassfish/debian/patches/appserv.diff	                        (rev 0)
+++ trunk/glassfish/debian/patches/appserv.diff	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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>
+ 

Modified: trunk/glassfish/debian/patches/jstl.diff
===================================================================
--- trunk/glassfish/debian/patches/jstl.diff	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/patches/jstl.diff	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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"));
      }

Modified: trunk/glassfish/debian/patches/properties.diff
===================================================================
--- trunk/glassfish/debian/patches/properties.diff	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/patches/properties.diff	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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}/../..

Modified: trunk/glassfish/debian/patches/series
===================================================================
--- trunk/glassfish/debian/patches/series	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/patches/series	2010-02-18 03:55:54 UTC (rev 11621)
@@ -1,2 +1,4 @@
+appserv.diff
 properties.diff
 jstl.diff
+

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/rules	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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 */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                         \

Added: trunk/glassfish/debian/source/format
===================================================================
--- trunk/glassfish/debian/source/format	                        (rev 0)
+++ trunk/glassfish/debian/source/format	2010-02-18 03:55:54 UTC (rev 11621)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/glassfish/debian/watch
===================================================================
--- trunk/glassfish/debian/watch	2010-02-18 02:38:40 UTC (rev 11620)
+++ trunk/glassfish/debian/watch	2010-02-18 03:55:54 UTC (rev 11621)
@@ -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

More information about the pkg-java-commits mailing list