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

[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  bee23192b6c70e6e204afa0c5fa0e93ea322406f (commit)
       via  0288396268e6dda714fbe0867c63b610c785b1bf (commit)
      from  d7c4e11c8c1399785663077d44d2e1cd7aad8b7b (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 bee23192b6c70e6e204afa0c5fa0e93ea322406f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 17 03:31:14 2010 +0100

    Remove unneeded hard-coded xulrunner-1.9.1 dependency.

commit 0288396268e6dda714fbe0867c63b610c785b1bf
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 17 03:30:30 2010 +0100

    Add use-stable-xulrunner.patch for xulrunner 1.9.2 compatibility.

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

Summary of changes:
 debian/control                                  |    1 -
 debian/patches/series                           |    1 +
 debian/patches/use-stable-xulrunner.patch       |   17 +++++++++++++++++
 patches/eclipse-swt-buildagainstxulrunner.patch |    4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 930e9f3..b566163 100644
--- a/debian/control
+++ b/debian/control
@@ -129,7 +129,6 @@ Depends: ant (>= 1.7.1),
          liblucene2-java (>= 2.9.1+ds1-5),
          libservlet2.5-java (>= 6.0.20-8),
          sat4j (>= 2.1.0),
-         xulrunner-1.9.1,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/series b/debian/patches/series
index 50204de..1fbafe1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ symlink-system-files.patch
 compile-jarinjarloader.patch
 compile-xulfiles.patch
 compile-IPluginDescriptor.patch
+use-stable-xulrunner.patch
diff --git a/debian/patches/use-stable-xulrunner.patch b/debian/patches/use-stable-xulrunner.patch
new file mode 100644
index 0000000..d97ab0d
--- /dev/null
+++ b/debian/patches/use-stable-xulrunner.patch
@@ -0,0 +1,17 @@
+Description: Use stable libxul instead of libxul-unstable
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=306119
+
+--- a/patches/eclipse-swt-buildagainstxulrunner.patch
++++ b/patches/eclipse-swt-buildagainstxulrunner.patch
+@@ -23,8 +23,8 @@
+  	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ -		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+ -		XULRUNNER_LIBS=`pkg-config --libs libxul`
+-+		XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable`
+-+		XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue"
+++		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
+  		export XULRUNNER_INCLUDES
+  		export XULRUNNER_LIBS
+ -		MAKE_MOZILLA=make_xulrunner
diff --git a/patches/eclipse-swt-buildagainstxulrunner.patch b/patches/eclipse-swt-buildagainstxulrunner.patch
index 5e75a62..64e2f19 100644
--- a/patches/eclipse-swt-buildagainstxulrunner.patch
+++ b/patches/eclipse-swt-buildagainstxulrunner.patch
@@ -23,8 +23,8 @@ diff -u -r1.54 build.sh
  	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
 -		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
 -		XULRUNNER_LIBS=`pkg-config --libs libxul`
-+		XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable`
-+		XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue"
++		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
  		export XULRUNNER_INCLUDES
  		export XULRUNNER_LIBS
 -		MAKE_MOZILLA=make_xulrunner


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