[pkg-java] r13697 - trunk/ant/debian

[Niels Thykier]

Author: nthykier
Date: 2011-05-19 11:30:31 +0000 (Thu, 19 May 2011)
New Revision: 13697

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/rules
Log:
Skip javadoc building when building with -B

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2011-05-19 04:21:29 UTC (rev 13696)
+++ trunk/ant/debian/changelog	2011-05-19 11:30:31 UTC (rev 13697)
@@ -1,3 +1,11 @@
+ant (1.8.2-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Skip javadoc building if we are not building architecture all
+    packages.  (Closes: #627110)
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 19 May 2011 13:08:21 +0200
+
 ant (1.8.2-1) unstable; urgency=low
 
   [ James Page ]

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2011-05-19 04:21:29 UTC (rev 13696)
+++ trunk/ant/debian/rules	2011-05-19 11:30:31 UTC (rev 13697)
@@ -40,11 +40,19 @@
 	# remove -SNAPSHOT from the versions in the Maven poms
 	perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
 	# the rest
-	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars javadocs
+	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars
 	ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
 	ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
 	touch stamp-build-ant
 
+build-ant-doc: stamp-build-ant-doc
+stamp-build-ant-doc:
+	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties javadocs
+	touch $@
+
+install/ant-doc:: build-ant-doc
+	-rm -f docs/manual/LICENSE
+
 install/ant:: build-ant
 	dh_install -pant
 	mh_installpoms -pant --set-version=$(VERSION)
@@ -96,9 +104,6 @@
 	dh_nativejava -pant-optional-gcj
 endif
 
-install/ant-doc::
-	-rm -f docs/manual/LICENSE
-
 clean::
 	-rm -f gjdoc_rawcomment.cache
 	-rm -rf bin bootstrap build lib/*.jar