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

[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  4f49c099171d2d32143d1a47b2b80f9aadd15b3f (commit)
      from  0c9ed9c54cc6eed3428f3608c0ed62c239814657 (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 4f49c099171d2d32143d1a47b2b80f9aadd15b3f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 17 15:57:55 2010 +0100

    Make xuldir setting work on Debian.

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

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

diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 674b611..7bcbdfb 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -5,9 +5,7 @@
 # https://bugs.launchpad.net/bugs/458703
 export GDK_NATIVE_WINDOWS=true
 
-xuldir=/usr/lib/xulrunner-$(@XULRUNNER@ --gre-version)
-
-export LD_LIBRARY_PATH="$xuldir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="@XULDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
 ECLIPSE=/usr/lib/eclipse/eclipse
 
diff --git a/debian/rules b/debian/rules
index f432a44..6e22c55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,11 +99,7 @@ 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.*$$//")
 
-XULVERSION := $(shell pkg-config --modversion libxul)
-XULVERSION_STRIPPED := $(shell echo $(XULVERSION) | sed "s/\.[^\.]*$$//")
-XULRUNNER := $(shell if which xulrunner-$(XULVERSION) > /dev/null 2>&1; then which xulrunner-$(XULVERSION); \
-		elif which xulrunner-$(XULVERSION_STRIPPED) > /dev/null 2>&1; then which xulrunner-$(XULVERSION_STRIPPED); \
-		else which xulrunner-$(shell echo $(XULVERSION) | sed "s/\.[^\.]*\.[^\.]*$$//"); fi)
+XULDIR := $(shell pkg-config --variable=sdkdir libxul | sed "s/-devel//")
 
 override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
@@ -172,7 +168,7 @@ override_dh_install:
 	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
 	# wrapper script for setting LD_LIBRARY_PATH
 	rm -f debian/tmp/usr/bin/eclipse
-	sed "s|@XULRUNNER@|$(XULRUNNER)|" debian/extra/eclipse > debian/tmp/usr/bin/eclipse
+	sed "s|@XULDIR@|$(XULDIR)|" 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.