[pkg-java] r4594 - trunk/glassfish/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-02 17:08:59 +0000 (Fri, 02 Nov 2007)
New Revision: 4594

Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/glassfish-javaee.install
   trunk/glassfish/debian/rules
Log:
* glassfish-javaee: Build and install ejb-api too.



Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2007-11-02 15:56:45 UTC (rev 4593)
+++ trunk/glassfish/debian/build.xml	2007-11-02 17:08:59 UTC (rev 4594)
@@ -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"/>

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2007-11-02 15:56:45 UTC (rev 4593)
+++ trunk/glassfish/debian/changelog	2007-11-02 17:08:59 UTC (rev 4594)
@@ -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)

Modified: trunk/glassfish/debian/glassfish-javaee.install
===================================================================
--- trunk/glassfish/debian/glassfish-javaee.install	2007-11-02 15:56:45 UTC (rev 4593)
+++ trunk/glassfish/debian/glassfish-javaee.install	2007-11-02 17:08:59 UTC (rev 4594)
@@ -1 +1,2 @@
 debian/tmp/usr/share/java/glassfish-javaee*
+debian/tmp/usr/share/java/glassfish-ejb-api*

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2007-11-02 15:56:45 UTC (rev 4593)
+++ trunk/glassfish/debian/rules	2007-11-02 17:08:59 UTC (rev 4594)
@@ -10,14 +10,15 @@
 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: