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

[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  ae3f1c53ace9f56b863bf3e3dc340f780cfcc580 (commit)
      from  1406d03fd8aae5822661f30070b9f699c9636e51 (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 ae3f1c53ace9f56b863bf3e3dc340f780cfcc580
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Mar 11 15:19:57 2010 +0100

    Remove dh_xulrunner call from override_dh_shlibdeps target.

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

Summary of changes:
 debian/rules |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/debian/rules b/debian/rules
index ba39eb4..9e4f310 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,29 @@ override_dh_auto_build:
 override_dh_auto_install:
 	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+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
+
 # TODO: Turn all commands below this comment into patches and send them to eclipse-build.
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
 	ECLIPSE_BUILD_ARCH=x86
 endif
@@ -60,29 +80,6 @@ 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.