[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 627484a82ab12f85c1615f642413806ceba1f090

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  627484a82ab12f85c1615f642413806ceba1f090 (commit)
      from  a91d20a96367850460e63265d7f0f47abe949a94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 627484a82ab12f85c1615f642413806ceba1f090
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 18:42:55 2009 +0200

    use DEB_ANT_BUILD_TARGET instead of debian-build-stamp target to build

-----------------------------------------------------------------------

Summary of changes:
 debian/rules |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 095857b..e1647d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,15 @@ include /usr/share/cdbs/1/class/ant.mk
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/eclipsebuild-vars.mk
 
-DEB_ANT_BUILD_TARGET := applyPatches
+DEB_ANT_BUILD_TARGET := provision.sdk
 DEB_ANT_CLEAN_TARGET := distclean
+
+ANT_ARGS := -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni
 
+# workaround for Debian bug #420287
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar
+
 export JAVA_HOME=/usr/lib/jvm/default-java
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
@@ -42,7 +47,6 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: binary-install/%:
 debian-build-stamp:
 	@echo "*** debian-build-stamp ***"
 	dh_testdir
-	ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 	( eval LAUNCHERVERSION=`ls $(RESULT_DIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//'` && \
 		cd "$(SOURCE_DIR)/plugins/org.eclipse.equinox.initializer" && \
 		java -cp "$(RESULT_DIR)"/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.