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

[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  ad8c1ee0a686d9b1cdd915c44502fb126d8a324e (commit)
      from  8cb77eaf8cda8c0dc534e1d628fdc36fc79216b6 (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 ad8c1ee0a686d9b1cdd915c44502fb126d8a324e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 10 22:41:56 2009 +0200

    Link against system jars post build.

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

Summary of changes:
 debian/control                |   14 ++++++++++++++
 debian/extra/plugin-linker.sh |   21 +++++++++++++++++++++
 debian/rules                  |    6 ++++++
 debian/sys-jars               |    8 ++++++++
 4 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/debian/control b/debian/control
index dac180b..eb20e9c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,25 @@ Build-Depends: ant (>= 1.7.1),
                cdbs,
                debhelper (>= 7),
                default-jdk,
+               junit4,
                libatk1.0-dev,
                libcairo2-dev,
+               libcommons-el-java,
+               libcommons-codec-java,
+               libcommons-httpclient-java,
+               libhamcrest-java,
                libgl1-mesa-dev | libgl-dev,
                libglu1-mesa-dev | libglu-dev,
                libgnomeui-dev,
                libgnome-vfsmm-2.6-dev,
                libgtk2.0-dev,
+               libjsch-java,
                liblucene2-java,
                libpango1.0-dev,
+	       libservlet2.5java,
                libxtst-dev,
                lsb-release,
+               perl-base,
                pkg-config,
                quilt,
                sharutils,
@@ -55,6 +63,7 @@ Depends: ant-optional,
          eclipse-platform (= ${binary:Version}),
          junit (>= 3.8.2),
          junit4,
+         libhamcrest-java,
          ${misc:Depends}
 Suggests: eclipse
 Description: Eclipse Java Development Tools (JDT)
@@ -90,7 +99,12 @@ Depends: default-jre | java1-runtime | java2-runtime,
          eclipse-platform-data (= ${source:Version}),
          eclipse-rcp (= ${binary:Version}),
          java-common (>= 0.23),
+         libcommons-el-java,
+         libcommons-codec-java,
+         libcommons-httpclient-java,
+         libjsch-java,
          liblucene2-java,
+         libservlet2.5java,
          libswt-gtk-3.5-java (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
diff --git a/debian/extra/plugin-linker.sh b/debian/extra/plugin-linker.sh
new file mode 100644
index 0000000..d3d8737
--- /dev/null
+++ b/debian/extra/plugin-linker.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+ECLIPSE_PATH="$1"
+PLUGIN="$2"
+SYSTEM_JAR="$3"
+
+PLUGIN_NAME=`echo "$2"/plugins/"$3"*`
+
+if [ ! -e "$PLUGIN_NAME" ] ; then
+    echo "Cannot find PLUGIN in $ECLIPSE_PATH/plugins" >&2
+    exit 1
+fi
+if [ ! -e "$SYSTEM_JAR" ] ; then
+    echo "Cannot find $SYSTEM_JAR" >&2
+    exit 1
+fi
+
+echo "Replacing $PLUGIN with $SYSTEM_JAR"
+rm "$PLUGIN_NAME"
+ln -s "$SYSTEM_JAR" "$PLUGIN_NAME"
diff --git a/debian/rules b/debian/rules
index 4534746..30012b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,3 +143,9 @@ debian-install-stamp:
 	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
 	# wrapper script for setting LD_LIBRARY_PATH
 	install -m 755 debian/extra/eclipse $(DEB_DESTDIR)usr/bin/eclipse
+	# Use system libraries for the installed eclipse.
+	for LINE in `grep -v '#' debian/sys-jars` ; do \
+		if [ "X$LINE" != X ] ; then \
+			sh debian/extra/plugin-linker.sh "$(DEB_DESTDIR)usr/lib/eclipse/" `echo $$LINE | sed 's/:/ /g'` ; \
+		fi ;\
+	done
diff --git a/debian/sys-jars b/debian/sys-jars
new file mode 100644
index 0000000..f85f4ac
--- /dev/null
+++ b/debian/sys-jars
@@ -0,0 +1,8 @@
+com.jcraft.jsch_:/usr/share/java/jsch.jar
+javax.servlet.jsp_:/usr/share/java/servlet-api-2.5.jar
+org.apache.commons.codec_:/usr/share/java/commons-codec.jar
+org.apache.commons.el_:/usr/share/java/commons-el.jar
+org.apache.commons.logging_:/usr/share/java/commons-logging.jar
+org.apache.lucene.analysis_:/usr/share/java/lucene-analyzers.jar
+org.hamcrest.core_:/usr/share/java/hamcrest-core.jar
+org.junit4_:/usr/share/java/junit4.jar


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