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

[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 - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  08484f25b71f8f925eab728cb2f01649601aafb3 (commit)
      from  c3edb4a8703709a8464115507854b4496c86fc8a (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 08484f25b71f8f925eab728cb2f01649601aafb3
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Mar 9 16:39:17 2010 +0100

    Fixed regression with ${shlib:Recommends}.

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

Summary of changes:
 debian/rules |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index c8ce5e2..ba39eb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,29 @@ LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launch
 PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
 UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//")
 
+JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
+
+override_dh_shlibdeps:
+	dh_shlibdeps -peclipse-rcp -l$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
+		-- -dDepends \
+			$(JNI_SO_PATH)/libswt-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-atk-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-awt-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-cairo-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-pi-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-xpcominit-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-xulrunner-gtk-*.so \
+			$(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-) \
+			$(LAUNCHER_LIB) \
+		-dRecommends \
+			$(JNI_SO_PATH)/libswt-gnome-gtk-*.so \
+			$(JNI_SO_PATH)/libswt-glx-gtk-*.so
+	dh_shlibdeps --remaining-packages
+	# For some reason this is not called when we override dh_shlibdeps
+	# so calling it manually here.
+	dh_xulrunner
+
 override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
 	# Remove some bad arguments that causes eclipse to fail


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