Author: twerner
Date: 2010-05-18 20:19:36 +0000 (Tue, 18 May 2010)
New Revision: 12448
Modified:
trunk/glassfish/debian/build.xml
trunk/glassfish/debian/changelog
trunk/glassfish/debian/glassfish-javaee.install
trunk/glassfish/debian/rules
Log:
Install some POM files. (Closes: #581885)
Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml 2010-05-18 19:59:41 UTC (rev 12447)
+++ trunk/glassfish/debian/build.xml 2010-05-18 20:19:36 UTC (rev 12448)
@@ -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>
Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog 2010-05-18 19:59:41 UTC (rev 12447)
+++ trunk/glassfish/debian/changelog 2010-05-18 20:19:36 UTC (rev 12448)
@@ -5,7 +5,7 @@
* 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 <twer...@debian.org> Tue, 18 May 2010 21:31:25 +0200
Modified: trunk/glassfish/debian/glassfish-javaee.install
===================================================================
--- trunk/glassfish/debian/glassfish-javaee.install 2010-05-18 19:59:41 UTC
(rev 12447)
+++ trunk/glassfish/debian/glassfish-javaee.install 2010-05-18 20:19:36 UTC
(rev 12448)
@@ -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*
Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules 2010-05-18 19:59:41 UTC (rev 12447)
+++ trunk/glassfish/debian/rules 2010-05-18 20:19:36 UTC (rev 12448)
@@ -35,5 +35,11 @@
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
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
