[glassfish] 35/40: Install some POM files. (Closes: #581885)

[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 9f72403e580521cf3962e97d93535891ce1a1b4c
Author: Torsten Werner <twerner at debian.org>
Date:   Tue May 18 20:19:36 2010 +0000

    Install some POM files. (Closes: #581885)
---
 debian/build.xml                | 16 ++++++++++++++--
 debian/changelog                |  2 +-
 debian/glassfish-javaee.install |  1 -
 debian/rules                    |  6 ++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index f0f62f2..6cf9d31 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -88,7 +88,7 @@
     <!-- <ant dir="../appserv-native" target="all"/> -->
   </target>
 
-  <target name="mail-pom" description="update mail POM">
+  <target name="mail-pom">
     <property file="../mail/build.properties"/>
     <copy file="../mail/mail.pom" tofile="poms/mail.xml">
       <filterset>
@@ -97,6 +97,18 @@
     </copy>
   </target>
 
-  <target name="pom" depends="jar, mail-pom" description="update all POMs"/>
+  <target name="ejb-api-pom">
+    <property file="../ejb-api/build.properties"/>
+    <copy file="../ejb-api/ejb-api.pom" tofile="poms/ejb-api.xml">
+      <filterset>
+	<filter token="VERSION" value="${release.version}"/>
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="pom" depends="jar" description="update all POMs">
+    <antcall target="mail-pom" inheritAll="false"/>
+    <antcall target="ejb-api-pom" inheritAll="false"/>
+  </target>
 
 </project>
diff --git a/debian/changelog b/debian/changelog
index 07a210e..ffeaef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ glassfish (1:2.1.1-b31-1) unstable; urgency=low
   * Convert patches to dep3 format.
   * Invoke ant twice if the first execution fails. Remove the <sleep/>
     workaround.
-  * Install POM file for glassfish-mail. (Closes: #581885)
+  * Install some POM files. (Closes: #581885)
 
  -- Torsten Werner <twerner at debian.org>  Tue, 18 May 2010 21:31:25 +0200
 
diff --git a/debian/glassfish-javaee.install b/debian/glassfish-javaee.install
index 92d6117..04c9b52 100644
--- a/debian/glassfish-javaee.install
+++ b/debian/glassfish-javaee.install
@@ -1,3 +1,2 @@
 debian/tmp/usr/share/java/glassfish-javaee*
-debian/tmp/usr/share/java/glassfish-ejb-api*
 debian/tmp/usr/share/java/glassfish-appserv-jstl*
diff --git a/debian/rules b/debian/rules
index 046c129..8b74594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,5 +35,11 @@ install/glassfish-mail::
 	mh_installjar -pglassfish-mail debian/poms/mail.xml \
 	  publish/glassfish/lib/mail.jar /usr/share/java/glassfish-mail.jar
 
+install/glassfish-javaee::
+	mh_installpom -pglassfish-javaee debian/poms/ejb-api.xml
+	mh_installjar -pglassfish-javaee debian/poms/ejb-api.xml \
+	  ejb-api/build/release/ejb-api.jar \
+	  /usr/share/java/glassfish-ejb-api.jar
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

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