Author: drazzib Date: 2011-05-24 21:43:15 +0000 (Tue, 24 May 2011) New Revision: 13701
Added: trunk/glassfish/debian/jee.pom Modified: trunk/glassfish/debian/changelog trunk/glassfish/debian/control trunk/glassfish/debian/copyright trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch trunk/glassfish/debian/rules trunk/glassfish/debian/watch Log: * 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. Modified: trunk/glassfish/debian/changelog =================================================================== --- trunk/glassfish/debian/changelog 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/changelog 2011-05-24 21:43:15 UTC (rev 13701) @@ -1,8 +1,16 @@ -glassfish (1:2.1.1-b31-3) UNRELEASED; urgency=low +glassfish (1:2.1.1-b31g-1) unstable; urgency=low - * debian/control: Depend on -headless Java runtimes + * 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. - -- Thierry Carrez <thierry.car...@ubuntu.com> Tue, 20 Jul 2010 15:21:19 +0200 + -- Damien Raude-Morvan <draz...@debian.org> Tue, 24 May 2011 22:56:36 +0200 glassfish (1:2.1.1-b31-2) unstable; urgency=low Modified: trunk/glassfish/debian/control =================================================================== --- trunk/glassfish/debian/control 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/control 2011-05-24 21:43:15 UTC (rev 13701) @@ -2,17 +2,18 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner <twer...@debian.org> +Uploaders: Varun Hiremath <va...@debian.org>, Torsten Werner <twer...@debian.org>, + Damien Raude-Morvan <draz...@debian.org> Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper Build-Depends-Indep: ant, default-jdk, libaxis-java -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 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}, default-jre | java2-runtime +#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,40 +22,40 @@ Package: glassfish-activation Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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 Application Server, the Java EE 5 Reference Implementation, and the Java Persistence API Reference Implementation, TopLink Essentials. . - This package ships only the activation part of Glassfish. + This package ships only the activation part of GlassFish. Package: glassfish-appserv Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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 Application Server, the Java EE 5 Reference Implementation, and the Java Persistence API Reference Implementation, TopLink Essentials. . - This package ships only the Application Server components of Glassfish. + This package ships only the Application Server components of GlassFish. Package: glassfish-jmac-api Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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 Application Server, the Java EE 5 Reference Implementation, and the Java Persistence API Reference Implementation, TopLink Essentials. . - This package ships only the Jmac API components of Glassfish. + This package ships only the Jmac API components of GlassFish. Package: glassfish-mail Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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 +66,7 @@ Package: glassfish-javaee Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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,11 +78,11 @@ Package: glassfish-toplink-essentials Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends} 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 Application Server, the Java EE 5 Reference Implementation, and the Java Persistence API Reference Implementation, TopLink Essentials. . - This package ships only the Toplink Essentials components of Glassfish. + This package ships only the Toplink Essentials components of GlassFish. Modified: trunk/glassfish/debian/copyright =================================================================== --- trunk/glassfish/debian/copyright 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/copyright 2011-05-24 21:43:15 UTC (rev 13701) @@ -473,9 +473,6 @@ ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - On Debian systems, the complete text of the BSD License can be - found in `/usr/share/common-licenses/BSD'. - ------------ The following files are released under BSD license: entity-persistence/src/java/oracle/toplink/libraries/asm/* @@ -507,9 +504,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - On Debian systems, the complete text of the BSD License can be - found in `/usr/share/common-licenses/BSD'. - ------------ For the following files: appserv-commons/src/java/org/apache/tools/ant/taskdefs/optional/sun/appserv/* Added: trunk/glassfish/debian/jee.pom =================================================================== --- trunk/glassfish/debian/jee.pom (rev 0) +++ trunk/glassfish/debian/jee.pom 2011-05-24 21:43:15 UTC (rev 13701) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>javax</groupId> + <artifactId>javaee-api</artifactId> + <version>5.0</version> + <packaging>jar</packaging> + + <name>Java(TM) EE 5 Specification APIs</name> + <description>Java(TM) EE 5 Specification APIs</description> + <url>http://java.sun.com/javaee/5/docs/api/index.html</url> +</project> Modified: trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch =================================================================== --- trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/patches/0001-Fix-appserv-api-build.patch 2011-05-24 21:43:15 UTC (rev 13701) @@ -6,21 +6,13 @@ appserv-api/build.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/appserv-api/build.xml b/appserv-api/build.xml -index f798d26..0c7eaab 100644 --- a/appserv-api/build.xml +++ b/appserv-api/build.xml -@@ -86,9 +86,10 @@ - source="${javac.source}" - deprecation="${javac.deprecation}" +@@ -88,7 +88,6 @@ failonerror="true"> -- <classpath refid="compile.classpath"/> -+ <classpath> -+ <pathelement location="${javaee.jar}"/> -+ </classpath> + <classpath refid="compile.classpath"/> <include name="**/*.java"/> - <compilerarg line="-Xlint:unchecked,fallthrough,serial,finally"/> </javac> </target> --- Modified: trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch =================================================================== --- trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/patches/0002-Fix-glassfish.root-directory.patch 2011-05-24 21:43:15 UTC (rev 13701) @@ -6,12 +6,10 @@ bootstrap/project.properties | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/bootstrap/project.properties b/bootstrap/project.properties -index a7e9d70..8fc4177 100644 --- a/bootstrap/project.properties +++ b/bootstrap/project.properties -@@ -46,8 +46,8 @@ glassfish.cvsroot=:pserver:${glassfish.cvs.username}@cvs.dev.java.net:/cvs - glassfish.cvstag=SJSAS91_FCS_BRANCH +@@ -46,8 +46,8 @@ + glassfish.cvstag=SGES211_FCS_BRANCH glassfish.cvs.project=glassfish glassfish.cvs.module=bootstrap -glassfish.root=${basedir}/../.. @@ -21,4 +19,3 @@ # You MUST use absolute path glassfish.home=${glassfish.root}/publish/glassfish --- Modified: trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch =================================================================== --- trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/patches/0003-Disable-SQL-exceptions.patch 2011-05-24 21:43:15 UTC (rev 13701) @@ -6,11 +6,9 @@ .../standard/tag/common/sql/DataSourceWrapper.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) -diff --git a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java -index 486276b..8fcb5ae 100644 --- a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +++ b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java -@@ -149,5 +149,19 @@ public class DataSourceWrapper implements DataSource { +@@ -149,5 +149,19 @@ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); } @@ -30,4 +28,3 @@ + } --- Modified: trunk/glassfish/debian/rules =================================================================== --- trunk/glassfish/debian/rules 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/rules 2011-05-24 21:43:15 UTC (rev 13701) @@ -15,13 +15,16 @@ clean:: $(RM) -r debian/poms -# The first invokation of ant fails sometimes: +# The first invokation of ant fails sometimes +# http://ant.apache.org/manual/Tasks/jar.html +# "Please note that ZIP files store file modification times with +# a granularity of two seconds. If a file is less than two seconds +# newer than the entry in the archive, Ant will not consider it newer." debian/stamp-ant-build: $(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET) || \ $(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET) touch debian/stamp-ant-build - common-install-prehook-indep:: for jar in $(ALL_JARS); do \ BASENAME=glassfish-`basename $$jar .jar`; \ @@ -56,6 +59,9 @@ mh_installpom -pglassfish-javaee debian/jms.pom mh_installjar -pglassfish-javaee debian/jms.pom \ jms-api/build/jms.jar /usr/share/java/glassfish-jms.jar + mh_installpom -pglassfish-javaee debian/jee.pom + mh_installjar -pglassfish-javaee debian/jee.pom \ + publish/glassfish/lib/javaee.jar /usr/share/java/glassfish-javaee.jar install/glassfish-activation:: mh_installpom -pglassfish-activation debian/poms/activation.xml Modified: trunk/glassfish/debian/watch =================================================================== --- trunk/glassfish/debian/watch 2011-05-22 19:21:44 UTC (rev 13700) +++ trunk/glassfish/debian/watch 2011-05-24 21:43:15 UTC (rev 13701) @@ -3,5 +3,5 @@ # after 2.1.2 gets available: #http://download.java.net/javaee5/v(2[[:digit:].]+)/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \ -http://download.java.net/javaee5/v2.1.1/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \ +http://download.java.net/javaee5/v2.1.1_branch/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits