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

[Torsten Werner]

Author: twerner
Date: 2010-05-18 19:48:30 +0000 (Tue, 18 May 2010)
New Revision: 12446

Removed:
   trunk/glassfish/debian/glassfish-mail.install
Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/control
   trunk/glassfish/debian/rules
Log:
* Invoke ant twice if the first execution fails. Remove the <sleep/>
  workaround.
* Install POM file for glassfish-mail. (Closes: #581885)

Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2010-05-18 18:42:43 UTC (rev 12445)
+++ trunk/glassfish/debian/build.xml	2010-05-18 19:48:30 UTC (rev 12446)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jar" name="Glassfish" basedir=".">
+<project default="pom" name="Glassfish" basedir=".">
   <property file="../bootstrap/project.properties"/>
   <target name="clean" description="Clean up">
     <ant dir="../activation" target="clean"/>
@@ -59,7 +59,6 @@
     <ant dir="../connector-api" target="all"/>
     <ant dir="../management-api" target="all"/>
     <ant dir="../jmac-api" target="all"/>
-    <sleep seconds="60"/>
     <ant dir="../appserv-api" target="all"/>
     <ant dir="../jacc-api" target="all"/>
     <ant dir="../common-util" target="all"/>
@@ -89,4 +88,15 @@
     <!-- <ant dir="../appserv-native" target="all"/> -->
   </target>
 
+  <target name="mail-pom" description="update mail POM">
+    <property file="../mail/build.properties"/>
+    <copy file="../mail/mail.pom" tofile="poms/mail.xml">
+      <filterset>
+	<filter token="VERSION" value="${release.version}"/>
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="pom" depends="jar, mail-pom" description="update all POMs"/>
+
 </project>

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2010-05-18 18:42:43 UTC (rev 12445)
+++ trunk/glassfish/debian/changelog	2010-05-18 19:48:30 UTC (rev 12446)
@@ -3,9 +3,11 @@
   * New upstream release
   * Update debian/watch for release 2.1.1.
   * Convert patches to dep3 format.
-  * Increase sleep time to 60 seconds.
+  * Invoke ant twice if the first execution fails. Remove the <sleep/>
+    workaround.
+  * Install POM file for glassfish-mail. (Closes: #581885)
 
- -- Torsten Werner <twerner at debian.org>  Tue, 18 May 2010 20:41:53 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 May 2010 21:31:25 +0200
 
 glassfish (1:2ur2-b04-6) unstable; urgency=low
 

Modified: trunk/glassfish/debian/control
===================================================================
--- trunk/glassfish/debian/control	2010-05-18 18:42:43 UTC (rev 12445)
+++ trunk/glassfish/debian/control	2010-05-18 19:48:30 UTC (rev 12446)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant, default-jdk, libaxis-java
 Standards-Version: 3.8.4
 Homepage: https://glassfish.dev.java.net/

Deleted: trunk/glassfish/debian/glassfish-mail.install
===================================================================
--- trunk/glassfish/debian/glassfish-mail.install	2010-05-18 18:42:43 UTC (rev 12445)
+++ trunk/glassfish/debian/glassfish-mail.install	2010-05-18 19:48:30 UTC (rev 12446)
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/glassfish-mail*

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2010-05-18 18:42:43 UTC (rev 12445)
+++ trunk/glassfish/debian/rules	2010-05-18 19:48:30 UTC (rev 12446)
@@ -4,7 +4,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME               := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp
 DEB_JARS                := jaxrpc
@@ -13,9 +12,16 @@
 ALL_JARS += $(wildcard */build/release/*.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 
-#clean::
-#	rm -rf publish/glassfish
+clean::
+	$(RM) -r debian/poms
 
+# The first invokation of ant fails sometimes:
+debian/stamp-ant-build:
+	$(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET) || \
+	  $(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET)
+	touch debian/stamp-ant-build
+
+
 common-install-prehook-indep::
 	for jar in $(ALL_JARS); do                         \
 	  BASENAME=glassfish-`basename $$jar .jar`;        \
@@ -24,5 +30,10 @@
 	  ln -sf $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
 	done
 
+install/glassfish-mail::
+	mh_installpom -pglassfish-mail debian/poms/mail.xml
+	mh_installjar -pglassfish-mail debian/poms/mail.xml -l \
+	  publish/glassfish/lib/mail.jar
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download