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

[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  26c67682a1ba538e742bd0806cc719d59804aa17 (commit)
      from  ba8cc2f32e4169ef44d9d3dac032847a82a97e0b (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 26c67682a1ba538e742bd0806cc719d59804aa17
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat May 8 23:14:31 2010 +0200

    Improve xulrunner path detection to work on Debian and Ubuntu.

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

Summary of changes:
 debian/extra/eclipse |    2 +-
 debian/rules         |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 69ec2fd..9b20395 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -5,7 +5,7 @@
 # https://bugs.launchpad.net/bugs/458703
 export GDK_NATIVE_WINDOWS=true
 
-export MOZILLA_FIVE_HOME="/usr/lib/xulrunner-$(@XULRUNNER@ --gre-version)"
+export MOZILLA_FIVE_HOME="@XULRUNNER_PATH@"
 
 ECLIPSE=/usr/lib/eclipse/eclipse
 
diff --git a/debian/rules b/debian/rules
index 508f57b..65ec791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,9 @@ XULVERSION_STRIP2 := $(shell echo $(XULVERSION_STRIP1) | sed "s/\.[^\.]*$$//")
 XULRUNNER := $(shell if which xulrunner-$(XULVERSION) > /dev/null 2>&1; then which xulrunner-$(XULVERSION); \
 	elif which xulrunner-$(XULVERSION_STRIP1) > /dev/null 2>&1; then which xulrunner-$(XULVERSION_STRIP1); \
 	elif which xulrunner-$(XULVERSION_STRIP2) > /dev/null 2>&1; then which xulrunner-$(XULVERSION_STRIP2); fi)
+XULRUNNER_PATH := $(shell if test -d /usr/lib/xulrunner-$(shell $(XULRUNNER) --gre-version 2> /dev/null); \
+	then echo '/usr/lib/xulrunner-$$($(XULRUNNER) --gre-version)'; \
+	else pkg-config --variable=sdkdir libxul | sed "s/-devel//"; fi)
 
 override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
@@ -172,9 +175,8 @@ override_dh_install:
 	# remove extra licence file
 	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
 	# wrapper script for setting MOZILLA_FIVE_HOME
-	$(if $(XULRUNNER),,$(error Cannot find xulrunner version))
 	rm -f debian/tmp/usr/bin/eclipse
-	sed "s|@XULRUNNER@|$(XULRUNNER)|" debian/extra/eclipse > debian/tmp/usr/bin/eclipse
+	sed 's|@XULRUNNER_PATH@|$(XULRUNNER_PATH)|' debian/extra/eclipse > debian/tmp/usr/bin/eclipse
 	chmod 755 debian/tmp/usr/bin/eclipse
 	# Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
 	sed -i 's/SDKProfile/PlatformProfile/' debian/tmp/usr/lib/eclipse/configuration/config.ini


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