[glassfish] 15/40: * Add Build-Depends: libaxis-java and remove wrong patch ejb.diff. * Change Standards-Version: 3.7.3.

[Emmanuel Bourg]

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 80879c775f659d589b5009ad5ab6b49a4cbcb338
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Dec 18 12:14:49 2007 +0000

    * Add Build-Depends: libaxis-java and remove wrong patch ejb.diff.
    * Change Standards-Version: 3.7.3.
---
 debian/changelog        |  4 +++-
 debian/control          |  4 ++--
 debian/patches/ejb.diff | 13 -------------
 debian/patches/series   |  1 -
 debian/rules            |  1 +
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be4e556..fbb826e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ 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.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 12:10:02 +0100
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 Dec 2007 13:14:00 +0100
 
 glassfish (2+b58g-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 255cdeb..668b3b4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, sun-java6-jdk
-Standards-Version: 3.7.2
+Build-Depends-Indep: ant, sun-java6-jdk, libaxis-java
+Standards-Version: 3.7.3
 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/patches/ejb.diff b/debian/patches/ejb.diff
deleted file mode 100644
index a90bdd0..0000000
--- a/debian/patches/ejb.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: glassfish-v2+b58g/ejb-api/src/share/classes/javax/ejb/SessionContext.java
-===================================================================
---- glassfish-v2+b58g.orig/ejb-api/src/share/classes/javax/ejb/SessionContext.java	2007-10-27 19:32:56.000000000 +0530
-+++ glassfish-v2+b58g/ejb-api/src/share/classes/javax/ejb/SessionContext.java	2007-10-27 19:34:41.000000000 +0530
-@@ -37,7 +37,7 @@
- 
- import java.util.*;
- import java.security.Identity;
--import javax.xml.rpc.handler.MessageContext;
-+import javax.mail.MessageContext;
- 
- /**
-  * The SessionContext interface provides access to the runtime session context 
diff --git a/debian/patches/series b/debian/patches/series
index e637f0d..defc844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 properties.diff
-ejb.diff
diff --git a/debian/rules b/debian/rules
index 48ffff7..3242e8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp
+DEB_JARS                := jaxrpc
 
 ALL_JARS := $(wildcard publish/glassfish/lib/*.jar)
 ALL_JARS += $(wildcard */build/release/*.jar)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git