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

[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  1c19cb7df28e679f3066403e24fad78a83b4cd85 (commit)
       via  76f80eb2365eb230d236c00265b198f428bec247 (commit)
      from  3a9bb40e281bb180416c6844714d6c58dd038062 (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 1c19cb7df28e679f3066403e24fad78a83b4cd85
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 29 13:50:19 2010 +0200

    Added menu entry for the Debian menu.

commit 76f80eb2365eb230d236c00265b198f428bec247
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 29 13:49:24 2010 +0200

    Revert "Added menu entry for the Debian menu."
    
    This reverts commit 3a9bb40e281bb180416c6844714d6c58dd038062.

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

Summary of changes:
 debian/eclipse-platform.menu |    2 +-
 debian/rules                 |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/eclipse-platform.menu b/debian/eclipse-platform.menu
index 2f6b89e..b89bd6a 100644
--- a/debian/eclipse-platform.menu
+++ b/debian/eclipse-platform.menu
@@ -1 +1 @@
-?package(eclipse-platform):needs="X11" title="Eclipse" command="eclipse" section="Applications/Programming" 
+?package(eclipse-platform):needs="X11" title="Eclipse" command="eclipse" section="Applications/Programming"
diff --git a/debian/rules b/debian/rules
index b8f8cde..65ec791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,11 +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)
-XULRUNNER_PATH := $(shell pkg-config --variable=sdkdir libxul | sed "s/-devel//" )
-
+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


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