[glassfish] 12/40: * glassfish-javaee: Build and install ejb-api too.

[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 c38473099d5aaa867c370f493dbd2737df317535
Author: Torsten Werner <twerner at debian.org>
Date:   Fri Nov 2 17:08:59 2007 +0000

    * glassfish-javaee: Build and install ejb-api too.
---
 debian/build.xml                | 5 ++++-
 debian/changelog                | 6 ++++++
 debian/glassfish-javaee.install | 1 +
 debian/rules                    | 5 +++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 92b04f1..2e5e8c4 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -51,7 +51,10 @@
     <ant dir="../transaction-api" target="all"/>
     <!-- <ant dir="../servlet-api" target="all"/> -->
     <ant dir="../jms-api" target="all"/>
-    <ant dir="../ejb-api" target="all"/>
+    <ant dir="../ejb-api">
+      <target name="all"/>
+      <target name="jar"/>
+    </ant>
     <ant dir="../persistence-api" target="all"/>
     <ant dir="../connector-api" target="all"/>
     <ant dir="../management-api" target="all"/>
diff --git a/debian/changelog b/debian/changelog
index 4ee5704..0bc06f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glassfish (2+b58g-2) unstable; urgency=low
+
+  * glassfish-javaee: Build and install ejb-api too.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 02 Nov 2007 17:54:59 +0100
+
 glassfish (2+b58g-1) unstable; urgency=low
 
   * Initial release (Closes: #448509)
diff --git a/debian/glassfish-javaee.install b/debian/glassfish-javaee.install
index 469e307..fe3bf82 100644
--- a/debian/glassfish-javaee.install
+++ b/debian/glassfish-javaee.install
@@ -1 +1,2 @@
 debian/tmp/usr/share/java/glassfish-javaee*
+debian/tmp/usr/share/java/glassfish-ejb-api*
diff --git a/debian/rules b/debian/rules
index 70ce87e..ae4663b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,15 @@ DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= servlet-api jsp-api
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp
 
-ALL_JARS = $(wildcard publish/glassfish/lib/*.jar)
+ALL_JARS := $(wildcard publish/glassfish/lib/*.jar)
+ALL_JARS += $(wildcard */build/release/*.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 common-install-prehook-indep::
 	for jar in $(ALL_JARS); do                         \
 	  BASENAME=glassfish-`basename $$jar .jar`;        \
 	  FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
 	  install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME;  \
-	  ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
+	  ln -sf $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
 	done
 
 get-orig-source:

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