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 de1aec0e87e79b772c0dc01f387878cc134bc8df Author: Varun Hiremath <[email protected]> Date: Fri Jun 26 01:37:21 2009 +0000 * Change build order in debian/build.xml, fixes FTBFS (Closes: #533461) * Bump Standards-Version to 3.8.2 --- debian/build.xml | 3 +- debian/changelog | 8 +++-- debian/control | 4 +-- debian/copyright | 76 +++++++++++++++++++++--------------------- debian/patches/jstl.diff | 1 + debian/patches/properties.diff | 1 + debian/rules | 4 +++ 7 files changed, 53 insertions(+), 44 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index fd9260e..35a5f4f 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -58,9 +58,8 @@ <ant dir="../persistence-api" target="all"/> <ant dir="../connector-api" target="all"/> <ant dir="../management-api" target="all"/> - <sleep milliseconds="2000"/> - <ant dir="../appserv-api" target="all"/> <ant dir="../jmac-api" target="all"/> + <ant dir="../appserv-api" target="all"/> <ant dir="../jacc-api" target="all"/> <ant dir="../common-util" target="all"/> <ant dir="../annotation-framework" target="all"/> diff --git a/debian/changelog b/debian/changelog index 24bdea2..2552cbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ glassfish (1:2ur2-b04-3) unstable; urgency=low - UNRELEASED + [ Torsten Werner ] * Change watch file to stay with major version 2. - -- Torsten Werner <[email protected]> Thu, 04 Dec 2008 11:11:23 +0100 + [ 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 diff --git a/debian/control b/debian/control index b7ccaa1..fddbc16 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ Source: glassfish Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[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.0 +Standards-Version: 3.8.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 diff --git a/debian/copyright b/debian/copyright index 9e3a6c4..80e8f54 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,41 +6,41 @@ It was downloaded from https://glassfish.dev.java.net/ Upstream Author: Sun Microsystems, Inc. Copyright: -(C) 1996-2005 Sun Microsystems, Inc. All Rights Reserved. -(C) 2004 Mark D. Anderson ([email protected]) -(C) 2002 Andy Clark. All rights reserved. -(C) 1994-2002 World Wide Web Consortium, (Massachusetts Institute of +© 1996-2005 Sun Microsystems, Inc. All Rights Reserved. +© 2004 Mark D. Anderson ([email protected]) +© 2002 Andy Clark. All rights reserved. +© 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. -(C) 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian -(C) 1996-2003 by Elliot Joel Berk and C. Scott Ananian -(C) 1999-2001 Rick Jelliffe, Academia Sinica Computing Centre, Taibei. -(C) 1999-2004 The Apache Software Foundation -(C) 2000-2001 by iPlanet/Sun Microsystems, Inc. -(C) 2000 Intalio Inc. All Rights Reserved. -(C) 2001 MetaStuff, Ltd. All Rights Reserved. -(C) 2003 James Strachan and Bob Mcwhirter. All Rights Reserved. -(C) 2006 Mort Bay Consulting Pty. Ltd. -(C) 1995-1997 IBM Corp. -(C) 1995-2001 International Business Machines Corporation -(C) 1995-2003 Jean-loup Gailly and Mark Adler -(C) 1996 Adam Twiss, Zeus Technology Ltd -(C) 1998 2007, Oracle. All rights reserved. -(C) 1999-2004 The PHP Group. All rights reserved. -(C) 2000,2001 Rick Jelliffe and Academia Sinica Computing Center, Taiwan -(C) 2000-2005 INRIA, France Telecom -(C) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi. -(C) 2001 Thai Open Source Software Center Ltd, Sun Microsystems. -(C) 2002, 2003 Gargoyle Software Inc. All rights reserved. -(C) 2002 JSON.org -(C) 2004-2006, The Dojo Foundation -(C) 2003 Kohsuke Kawaguchi -(C) 2004 Eugene Kuleshov -(C) 2004 Friendster Inc. -(C) 2005-2007 Sam Stephenson -(C) 2000-2002 Paul Johnston -(C) 2000 Intalio Inc. All Rights Reserved. -(C) 2004 Simon Willison +© 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian +© 1996-2003 by Elliot Joel Berk and C. Scott Ananian +© 1999-2001 Rick Jelliffe, Academia Sinica Computing Centre, Taibei. +© 1999-2004 The Apache Software Foundation +© 2000-2001 by iPlanet/Sun Microsystems, Inc. +© 2000 Intalio Inc. All Rights Reserved. +© 2001 MetaStuff, Ltd. All Rights Reserved. +© 2003 James Strachan and Bob Mcwhirter. All Rights Reserved. +© 2006 Mort Bay Consulting Pty. Ltd. +© 1995-1997 IBM Corp. +© 1995-2001 International Business Machines Corporation +© 1995-2003 Jean-loup Gailly and Mark Adler +© 1996 Adam Twiss, Zeus Technology Ltd +© 1998 2007, Oracle. All rights reserved. +© 1999-2004 The PHP Group. All rights reserved. +© 2000,2001 Rick Jelliffe and Academia Sinica Computing Center, Taiwan +© 2000-2005 INRIA, France Telecom +© 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi. +© 2001 Thai Open Source Software Center Ltd, Sun Microsystems. +© 2002, 2003 Gargoyle Software Inc. All rights reserved. +© 2002 JSON.org +© 2004-2006, The Dojo Foundation +© 2003 Kohsuke Kawaguchi +© 2004 Eugene Kuleshov +© 2004 Friendster Inc. +© 2005-2007 Sam Stephenson +© 2000-2002 Paul Johnston +© 2000 Intalio Inc. All Rights Reserved. +© 2004 Simon Willison License: @@ -480,7 +480,7 @@ License: The following files are released under BSD license: entity-persistence/src/java/oracle/toplink/libraries/asm/* -Copyright: (c) 2000,2002,2003 INRIA, France Telecom +Copyright: © 2000,2002,2003 INRIA, France Telecom License: Redistribution and use in source and binary forms, with or without @@ -514,12 +514,12 @@ License: For the following files: appserv-commons/src/java/org/apache/tools/ant/taskdefs/optional/sun/appserv/* -Copyright: (c) 1999 The Apache Software Foundation. +Copyright: © 1999 The Apache Software Foundation. License: The Apache Software License, Version 1.1 - Copyright (c) 1999 The Apache Software Foundation. All rights + Copyright © 1999 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -564,5 +564,5 @@ License: SUCH DAMAGE. ------------------------------------------------------------------------------ -The Debian packaging is (C) 2007, Varun Hiremath <[email protected]> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is © 2007, Varun Hiremath <[email protected]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/patches/jstl.diff b/debian/patches/jstl.diff index 421c05b..3607627 100644 --- a/debian/patches/jstl.diff +++ b/debian/patches/jstl.diff @@ -1,3 +1,4 @@ +Description: Disable SQL exceptions. Index: glassfish-2+b58g/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 diff --git a/debian/patches/properties.diff b/debian/patches/properties.diff index 40a56fc..931958d 100644 --- a/debian/patches/properties.diff +++ b/debian/patches/properties.diff @@ -1,3 +1,4 @@ +Description: Fix glassfish.root directory Index: glassfish-2+b58g/bootstrap/project.properties =================================================================== --- glassfish-2+b58g.orig/bootstrap/project.properties 2007-10-27 16:04:23.000000000 +0530 diff --git a/debian/rules b/debian/rules index 54e0a2a..44d39c8 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,10 @@ DEB_JARS := jaxrpc 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 + common-install-prehook-indep:: for jar in $(ALL_JARS); do \ BASENAME=glassfish-`basename $$jar .jar`; \ -- 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
