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 6194562c15909ba80a7f26bdb7dc0da2475ab85a (commit)
from 75176904958663af694d433b5b3130b8f32c1a14 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/extra/eclipse | 2 +-
debian/rules | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 7bcbdfb..69ec2fd 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 LD_LIBRARY_PATH="@xul...@${ld_library_path:+:$LD_LIBRARY_PATH}"
+export MOZILLA_FIVE_HOME="/usr/lib/xulrunner-$(@XULRUNNER@ --gre-version)"
ECLIPSE=/usr/lib/eclipse/eclipse
diff --git a/debian/rules b/debian/rules
index a1dc085..508f57b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,12 @@ 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.*$$//")
-XULDIR := $(shell pkg-config --variable=sdkdir libxul | sed "s/-devel//")
+XULVERSION := $(shell pkg-config --modversion libxul)
+XULVERSION_STRIP1 := $(shell echo $(XULVERSION) | sed "s/\.[^\.]*$$//")
+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)
override_dh_install:
# Turn all following commands into patches and send them to
eclipse-build
@@ -166,11 +171,11 @@ override_dh_install:
-l -I -r debian_tmp debian/tmp/ | xargs sed -i
s...@$${to_correct}@@g
# remove extra licence file
rm -f
debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
- # wrapper script for setting LD_LIBRARY_PATH
+ # wrapper script for setting MOZILLA_FIVE_HOME
+ $(if $(XULRUNNER),,$(error Cannot find xulrunner version))
rm -f debian/tmp/usr/bin/eclipse
- sed "s|@XULDIR@|$(XULDIR)|" debian/extra/eclipse >
debian/tmp/usr/bin/eclipse
+ sed "s|@XULRUNNER@|$(XULRUNNER)|" debian/extra/eclipse >
debian/tmp/usr/bin/eclipse
chmod 755 debian/tmp/usr/bin/eclipse
- printf "\n-Dorg.eclipse.swt.browser.XULRunnerPath=$(XULDIR)\n" >>
debian/tmp/etc/eclipse.ini
# 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
# Set a saner default file limit than "unlimited".
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
