[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 2e91100135c405bc60334b73dbc5c5bbf15d92aa
Benjamin Drung
bdrung-guest at alioth.debian.org
Tue Feb 16 14:51:16 UTC 2010
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 2e91100135c405bc60334b73dbc5c5bbf15d92aa (commit)
from 9187a28b2bef5ec6b0ef62bcccd4d2a1619cbb9c (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 2e91100135c405bc60334b73dbc5c5bbf15d92aa
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Feb 16 15:50:57 2010 +0100
Use lazy evaluation for DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp.
-----------------------------------------------------------------------
Summary of changes:
debian/rules | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/debian/rules b/debian/rules
index c0ce3e2..faeb3f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
-
-DEB_TARBALL :=
+DEB_TARBALL := $(NULL)
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
@@ -41,12 +40,11 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar
export JAVA_HOME=/usr/lib/jvm/default-java
export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
-JNI_SO_PATH:=debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+JNI_SO_PATH := debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
-SHARED_LIBS := $(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-)
LAUNCHER_LIB := debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
-DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp := \
+DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp = \
$(strip $(shell pkg-config --libs-only-L libxul | sed "s/-L/-l/g")):$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
-- -dDepends \
$(JNI_SO_PATH)/libswt-gtk-*.so \
@@ -56,7 +54,7 @@ DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp := \
$(JNI_SO_PATH)/libswt-pi-gtk-*.so \
$(JNI_SO_PATH)/libswt-xpcominit-gtk-*.so \
$(JNI_SO_PATH)/libswt-xulrunner-gtk-*.so \
- $(SHARED_LIBS) \
+ $(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-) \
$(LAUNCHER_LIB) \
-dRecommends \
$(JNI_SO_PATH)/libswt-gnome-gtk-*.so \
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list