./packages/openofficeorg/3.2/unstable r1834: this has to be ant1.7, of course
------------------------------------------------------------
revno: 1834
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sun 2010-02-28 20:21:12 +0100
message:
this has to be ant1.7, of course
modified:
rules
=== modified file 'rules'
--- a/rules 2010-02-28 18:49:19 +0000
+++ b/rules 2010-02-28 19:21:12 +0000
@@ -742,7 +742,7 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_OPENJDK_ARCHS)], ant-optional (>= 1.7.0) [$(OOO_OPENJDK_ARCHS)], ant1.7 [$(OOO_GCJ_JDK_ARCHS)], ant1.7-optional [$(OOO_GCJ_JDK_ARCHS)]
else
- BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_OPENJDK_ARCHS)], ant [$(OOO_GCJ_JDK_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_OPENJDK_ARCHS)], ant1.7 [$(OOO_GCJ_JDK_ARCHS)]
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
Reply to: