Author: mkoch
Date: 2007-07-07 10:26:41 +0000 (Sat, 07 Jul 2007)
New Revision: 3797
Modified:
trunk/ant/debian/changelog
trunk/ant/debian/rules
Log:
ant (1.6.5-9) unstable; urgency=low
* Fixed generation of binary-arch only packages. Closes: #430662.
-- Michael Koch <[EMAIL PROTECTED]> Sun, 01 Jul 2007 21:06:38 -0100
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2007-07-06 15:51:40 UTC (rev 3796)
+++ trunk/ant/debian/changelog 2007-07-07 10:26:41 UTC (rev 3797)
@@ -1,3 +1,9 @@
+ant (1.6.5-9) unstable; urgency=low
+
+ * Fixed generation of binary-arch only packages. Closes: #430662.
+
+ -- Michael Koch <[EMAIL PROTECTED]> Sun, 01 Jul 2007 21:06:38 -0100
+
ant (1.6.5-8) unstable; urgency=low
* Only compile to native on certain archs. Closes: #430662.
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2007-07-06 15:51:40 UTC (rev 3796)
+++ trunk/ant/debian/rules 2007-07-07 10:26:41 UTC (rev 3797)
@@ -30,7 +30,8 @@
JAR_PATH := /usr/share/java
CLASSPATH :=
${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-commons-resolver-1.1.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar
-build:
+build-ant: stamp-build-ant
+stamp-build-ant:
# doing bootstrapping
ln -sf /usr/share/java/jaxp-1.2.jar lib/xml-apis.jar
ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
@@ -39,8 +40,10 @@
# the rest
/bin/sh bootstrap/bin/ant -lib ${CLASSPATH} -propertyfile
debian/ant.properties jars javadocs
+ touch stamp-build-ant
-install/ant::
+
+install/ant:: build-ant
# Installing these files does not work with dh_install because of
# the file permissions
mkdir -p debian/ant/usr/share/ant/bin
@@ -48,13 +51,17 @@
install -m 755 src/script/antRun debian/ant/usr/share/ant/bin
install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin
+install/ant-optional:: build-ant
+
ifeq ($(with_gcj_native),yes)
install/ant-gcj:: install/ant
+ dh_install -pant
dh_nativejava -pant-gcj
endif
ifeq ($(with_gcj_native),yes)
install/ant-optional-gcj:: install/ant-optional
+ dh_install -pant-optional
dh_nativejava -pant-optional-gcj
endif
@@ -66,3 +73,4 @@
clean::
-rm -f gjdoc_rawcomment.cache
-rm -rf bin bootstrap build lib/*.jar
+ -rm -f stamp-build-ant
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
