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

[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  3a9bb40e281bb180416c6844714d6c58dd038062 (commit)
       via  c2cf6ae7414276329faa96ecdafc5d596b8a8d43 (commit)
       via  d39fe651abc2781c3f6fda95dfecaff7d89114b6 (commit)
       via  10058d385180291f2692d062fbbeef82a90a86f5 (commit)
      from  18acd8ae016182b259c4328224965de6eb1643ea (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 3a9bb40e281bb180416c6844714d6c58dd038062
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 29 13:46:10 2010 +0200

    Added menu entry for the Debian menu.

commit c2cf6ae7414276329faa96ecdafc5d596b8a8d43
Merge: d39fe651abc2781c3f6fda95dfecaff7d89114b6 18acd8ae016182b259c4328224965de6eb1643ea
Author: Niels Thykier <niels at thykier.net>
Date:   Sun May 9 00:17:21 2010 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit d39fe651abc2781c3f6fda95dfecaff7d89114b6
Merge: 10058d385180291f2692d062fbbeef82a90a86f5 26c67682a1ba538e742bd0806cc719d59804aa17
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 8 23:15:22 2010 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit 10058d385180291f2692d062fbbeef82a90a86f5
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 8 21:54:01 2010 +0200

    Bumped version (Build-)Depends on sat4j to ensure we do not have
    broken symlinks.

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

Summary of changes:
 debian/control               |    4 ++--
 debian/eclipse-platform.menu |    1 +
 debian/rules                 |    8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 8492f39..4e16b03 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends: ant (>= 1.7.1),
                libxtst-dev,
                lsb-release,
                pkg-config,
-               sat4j (>= 2.1.0),
+               sat4j (>= 2.1.1-3),
                unzip,
                xulrunner-dev (>= 1.9.1.3-2),
                zip
@@ -129,7 +129,7 @@ Depends: ant (>= 1.7.1),
          libjsch-java (>= 0.1.37-3),
          liblucene2-java (>= 2.9.1+ds1-5),
          libservlet2.5-java (>= 6.0.20-8),
-         sat4j (>= 2.1.0),
+         sat4j (>= 2.1.1-3),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
diff --git a/debian/eclipse-platform.menu b/debian/eclipse-platform.menu
new file mode 100644
index 0000000..2f6b89e
--- /dev/null
+++ b/debian/eclipse-platform.menu
@@ -0,0 +1 @@
+?package(eclipse-platform):needs="X11" title="Eclipse" command="eclipse" section="Applications/Programming" 
diff --git a/debian/rules b/debian/rules
index 65ec791..b8f8cde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,9 +105,11 @@ 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 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//" )
+
 
 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.