[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. a59e9e01955e66a9ef86057e1a6e69c02af4ac07

[Niels Thykier]

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-cdt - Plug-in for eclipse to handle C/C++ - Debian package.".

The branch, master has been updated
       via  a59e9e01955e66a9ef86057e1a6e69c02af4ac07 (commit)
      from  c843ebe2e9128a55d64aae445a5d215f1d0544b1 (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 a59e9e01955e66a9ef86057e1a6e69c02af4ac07
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 24 19:02:49 2010 +0200

    Fixed a problem with locating the JNI libraries and reduced the depends in d/eclipse.features.

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

Summary of changes:
 debian/eclipse.features |    2 +-
 debian/rules            |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/eclipse.features b/debian/eclipse.features
index 8b3d6b0..a494554 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -6,7 +6,7 @@ org.eclipse.cdt.platform rse
 org.eclipse.cdt rse
 org.eclipse.cdt.sdk rse
 org.eclipse.cdt.util rse
-org.eclipse.cdt.gnu.build rse org.eclipse.cdt.util org.eclipse.cdt
+org.eclipse.cdt.gnu.build rse org.eclipse.cdt.platform
 org.eclipse.cdt.gnu.debug rse
 org.eclipse.cdt.gnu.dsf rse
 
diff --git a/debian/rules b/debian/rules
index 1eeca9c..ad21236 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
 	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
 endif
 
-BUILD_DIR:=$(CURDIR)/debian/.eclipse-build
+BUILD_DIR:=debian/.eclipse-build
 
 %:
 	dh $@ --with eclipse-helper
@@ -35,10 +35,10 @@ override_dh_auto_clean:
 	# Do not use the auto-clean with ant.
 override_dh_auto_build:
 	# Do not use the auto-build with ant.
-
-override_jh_compilefeatures:
 	cd $(BUILD_DIR)/results/plugins/org.eclipse.cdt.core.linux/library && \
 		make JAVA_HOME="$(JAVA_HOME)" ARCH=$(ECLIPSE_BUILD_ARCH) CC='gcc -D_GNU_SOURCE' CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -fPIC"
+
+override_jh_compilefeatures:
 	jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
 
 override_dh_install:


hooks/post-receive
-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.