[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. fb76c7b3c7f1d691b9329f819ec2755333b93d66
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Oct 14 19:55:14 UTC 2009
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, ubuntu has been updated
via fb76c7b3c7f1d691b9329f819ec2755333b93d66 (commit)
via 260c693d5898e61daf99dc33f55a214a1683139f (commit)
via 135ab34818c72cf2f93763a415fe4560d03fe42d (commit)
via 4f0fc9f465637a0544efe8041b8c8e02faae1eef (commit)
via 18549f34cccc5d7cfdfc44bbb88eb0e3e0b93750 (commit)
via 6579be6a4e2e30bf619b62b24a65264ef0b4344d (commit)
via 7e7e5e9cd7b78b402724bc11aec80cdd066a3cb9 (commit)
via 5509d0fa3abadb4ff3ae4c89984a2b969e0e686e (commit)
via eac39263d7f500c6d735da8980795b782194b83a (commit)
via e19c4b4c1246a4e2ba3887f6e08987263659088a (commit)
via f1fcf931a0b50ea8338f9486127bddaeb9d82fe3 (commit)
via 2445f698a48bc74672fde41748ab78ac7c19333d (commit)
via ad8c1ee0a686d9b1cdd915c44502fb126d8a324e (commit)
via 8cb77eaf8cda8c0dc534e1d628fdc36fc79216b6 (commit)
via 16457dc4f2f4e66a2cea4d82082da06b54c8ad5c (commit)
via 3bfcdcccbb38af987a244dbf057c77a2da53a658 (commit)
via ed9d303069da7b405e4964a85b77c2e046cc2bb6 (commit)
via fbc404cd9c8b594cbfe424119bca662aa7f40815 (commit)
via 9eedea990c7693514cfb88b3293cb64eb92ee608 (commit)
via f43c3ef61866fb28c9b9a76e1129a0a4a4e2e326 (commit)
via bebf9508dba649a69d8a80a1a80582f0d0b29ff8 (commit)
via 1b3c33b1129c296b4779e117b097a045edc40aec (commit)
via d18e99b78eaa5f49716535de815e9432eca561fb (commit)
via 9b894a6d893396ff4316ae4d8c86250179e9c0fc (commit)
via ebbae2469ad7eeadd1d18c8cb915f643c1820cfc (commit)
via babc009fd689d786e6b299506394e426bb1c3bf5 (commit)
from 2d326d5ecb5d36734c77bb397e4634fbf0b614d7 (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 fb76c7b3c7f1d691b9329f819ec2755333b93d66
Merge: 2d326d5ecb5d36734c77bb397e4634fbf0b614d7 260c693d5898e61daf99dc33f55a214a1683139f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Oct 14 21:54:40 2009 +0200
Merge commit '260c693d5898e61daf99dc33f55a214a1683139f' into ubuntu
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 46 ++++++++++------------
debian/changelog | 8 +++-
debian/control | 16 +++++++-
debian/eclipse-jdt.install | 1 +
debian/eclipse-pde.install | 1 +
debian/eclipse-platform-data.install | 1 +
debian/eclipse-platform.install | 3 +
debian/eclipse-rcp.install | 2 +
debian/exclude_patterns.txt | 4 ++
debian/extra/imagemv.sh | 4 +-
debian/extra/plugin-linker.sh | 23 +++++++++++
debian/{patterns.txt => extract_patterns.txt} | 0
debian/libswt-gtk-3.5-jni.install | 1 -
debian/patches/libgnomeproxy.patch | 53 +++++++++++++++++++++++++
debian/patches/series | 2 +
debian/patches/symlink.patch | 22 ++++++++++
debian/rules | 32 +++++++++++----
debian/sys-jars | 8 ++++
18 files changed, 186 insertions(+), 41 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index ac38b4a..afa8dcf 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,31 +1,27 @@
-debian/control:
- - Look at correcting debian/extra/eclipse.sh to support
- xdialog or Xdialog and add that as alternative to zenity | kdebase-bin
+Things needed to be fixed (discussed on 2009-10-09 on IRC; sorted by importance):
+ * cdt
+ * xulrunner detection & dependency
+ * osgi jars in separate package https://launchpad.net/bugs/102717
+ * Use system jars rather than pre-compiled ones. (e.g. luence, ant, etc.)
+ * debian/rules: Turn all calls in debian-build-stamp and debian-install-stamp
+ into patches and send them to eclipse-build.
Things that needs fixing:
- - debian/rules: Turn all calls in debian-build-stamp and debian-install-stamp
- into patches and send them to eclipse-build.
- - Figure out if the executable could be stuffed into eclipse-platform rather than
- eclipse.
- - Clean up Ubuntu/LP bugs against eclipse.
- - Create patches to deal with "uname", so we don't have to use a wrapper.
- - Check upstream build system for other archs and check Fedora's "multi-arch" hacks.
- - Use system jars rather than pre-compiled ones. (e.g. luence, ant, etc.)
- - Expose certain eclipse jars to the world (see below).
-
+ - Create patches to deal with "uname", so we don't have to use a wrapper.
+ - Check upstream build system for other archs and check Fedora's "multi-arch" hacks.
+ - Expose certain eclipse jars to the world (see below).
Expose eclipse jars:
- Apparently libjibx-java is needed by openjdk7 and depends
- on some eclipse jars (beyond what is available in libecj-java)
+ libjibx-java depends on some eclipse jars (beyond what is available in libecj-java).
- org.eclipse.core.contenttype.jar
- org.eclipse.core.jobs.jar
- org.eclipse.core.resources.jar
- org.eclipse.core.runtime.jar
- org.eclipse.equinox.common.jar
- org.eclipse.equinox.preferences.jar
- org.eclipse.jdt.core.jar
- org.eclipse.jdt.core.manipulation.jar
- org.eclipse.osgi.jar
- org.eclipse.text.jar
+ org.eclipse.core.contenttype.jar
+ org.eclipse.core.jobs.jar
+ org.eclipse.core.resources.jar
+ org.eclipse.core.runtime.jar
+ org.eclipse.equinox.common.jar
+ org.eclipse.equinox.preferences.jar
+ org.eclipse.jdt.core.jar
+ org.eclipse.jdt.core.manipulation.jar
+ org.eclipse.osgi.jar
+ org.eclipse.text.jar
diff --git a/debian/changelog b/debian/changelog
index 3b1aa48..76e322f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,15 +22,19 @@ eclipse (3.5.1-0~ppa1) karmic; urgency=low
* Converted build system to use eclipse-build. (Closes: #501533)
* Removed obsolete linda overrides.
* New maintainers. (Closes: #526489)
- * Added kdebase-bin as alternative to zenity (Closes: #537605)
+ * Removed the need for Zenity (Closes: #528070)
* Added missing "apt" plug-in for eclipse-jdt.
(Closes: #403655, LP: #120610)
* Added conflicts on the old eclipse-*-nls packages.
(Closes: #538869)
* Removed "builtin browser not supported"-warning; it did not
work. (Closes: #403675, #402340)
- * Removed dependency on libtomcat5.5-java and liblucene-javadoc.
+ * Removed dependency on libtomcat5.5-java and liblucene-java-doc.
(Closes: #530722, #537605)
+ * Stopped using special hacks and work arounds to find JVMs.
+ (Closes: #353360)
+ * Moved the executable to eclipse-platform from eclipse.
+ (Closes: #358594)
-- Benjamin Drung <bdrung at ubuntu.com> Tue, 06 Oct 2009 00:37:32 +0200
diff --git a/debian/control b/debian/control
index 3029f6d..e8dc8b8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,15 +11,22 @@ 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.5-java,
libxtst-dev,
lsb-release,
pkg-config,
@@ -56,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)
@@ -91,9 +99,13 @@ Depends: default-jre | java1-runtime | java2-runtime,
eclipse-platform-data (= ${source:Version}),
eclipse-rcp (= ${binary:Version}),
java-common (>= 0.23),
- liblucene-java (>= 1.4.2),
+ libcommons-el-java,
+ libcommons-codec-java,
+ libcommons-httpclient-java,
+ libjsch-java,
+ liblucene2-java,
+ libservlet2.5-java,
libswt-gtk-3.5-java (= ${binary:Version}),
- zenity | kdebase-bin,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index 4536e82..c87d28e 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -1,3 +1,4 @@
+usr/*/eclipse/features/org.eclipse.jdt.source_*
usr/*/eclipse/features/org.eclipse.jdt_*
usr/lib/eclipse/plugins/org.eclipse.ant.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt.apt.core_*.jar
diff --git a/debian/eclipse-pde.install b/debian/eclipse-pde.install
index 617f884..07777ea 100644
--- a/debian/eclipse-pde.install
+++ b/debian/eclipse-pde.install
@@ -1,3 +1,4 @@
+usr/*/eclipse/features/org.eclipse.pde.source_*
usr/*/eclipse/features/org.eclipse.pde_*
usr/lib/eclipse/plugins/org.eclipse.pde.api.tools.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.api.tools_*.jar
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 720b950..7024f9d 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -1,3 +1,4 @@
+usr/share/eclipse/features/org.eclipse.platform.source_*
usr/share/eclipse/features/org.eclipse.platform_*
usr/share/eclipse/features/org.eclipse.sdk_*
usr/share/eclipse/plugins/org.eclipse.platform_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index fa8a560..1abb5e3 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -4,8 +4,10 @@ usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.inf
usr/lib/eclipse/configuration/org.eclipse.update/
usr/lib/eclipse/eclipse
usr/lib/eclipse/eclipse.ini
+usr/lib/eclipse/features/org.eclipse.platform.source_*
usr/lib/eclipse/features/org.eclipse.platform_*
usr/lib/eclipse/features/org.eclipse.sdk_*
+usr/lib/eclipse/metadata/*.xml
usr/lib/eclipse/p2/
usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
usr/lib/eclipse/plugins/javax.servlet.jsp_*.jar
@@ -121,4 +123,5 @@ usr/lib/eclipse/plugins/org.mortbay.jetty.server_*.jar
usr/lib/eclipse/plugins/org.mortbay.jetty.util_*.jar
usr/lib/eclipse/plugins/org.sat4j.core_*.jar
usr/lib/eclipse/plugins/org.sat4j.pb_*.jar
+usr/lib/eclipse/startup.jar
usr/share/applications
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index 4f0ca00..9a0142a 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,4 +1,6 @@
+usr/*/eclipse/features/org.eclipse.rcp.source_*
usr/*/eclipse/features/org.eclipse.rcp_*
+usr/lib/eclipse/configuration/org.eclipse.osgi/
usr/lib/eclipse/plugins/com.ibm.icu_*.jar
usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar
usr/lib/eclipse/plugins/org.eclipse.core.contenttype_*.jar
diff --git a/debian/exclude_patterns.txt b/debian/exclude_patterns.txt
new file mode 100644
index 0000000..f5fb22d
--- /dev/null
+++ b/debian/exclude_patterns.txt
@@ -0,0 +1,4 @@
+*.png
+*.gif
+*.jpg
+*.bmp
diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index b75dc18..99260dd 100755
--- a/debian/extra/imagemv.sh
+++ b/debian/extra/imagemv.sh
@@ -8,5 +8,5 @@ IMAGE_DIR=`dirname ${IMAGE_NAME}`
mkdir -p "${DESTDIR}${IMAGE_DIR}"
rm -f "${DESTDIR}${IMAGE_NAME}"
-mv -vf "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
-ln -sf "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
+mv "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
+ln -s "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
diff --git a/debian/extra/plugin-linker.sh b/debian/extra/plugin-linker.sh
new file mode 100644
index 0000000..ef19210
--- /dev/null
+++ b/debian/extra/plugin-linker.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+ECLIPSE_PATH="$1"
+PLUGIN="$2"
+SYSTEM_JAR="$3"
+
+PLUGIN_NAME=`echo "$1"/plugins/"$2"*`
+
+if [ ! -e "$PLUGIN_NAME" ] ; then
+ echo "Cannot find $PLUGIN in $ECLIPSE_PATH/plugins" >&2
+ echo "(Tried: $PLUGIN_NAME)" >&2
+ exit 1
+fi
+if [ ! -e "$SYSTEM_JAR" ] ; then
+ echo "Cannot find $SYSTEM_JAR" >&2
+ exit 1
+fi
+
+echo "Replacing `basename $PLUGIN_NAME` with $SYSTEM_JAR"
+rm "$PLUGIN_NAME"
+ln -s "$SYSTEM_JAR" "$PLUGIN_NAME"
+
diff --git a/debian/patterns.txt b/debian/extract_patterns.txt
similarity index 100%
rename from debian/patterns.txt
rename to debian/extract_patterns.txt
diff --git a/debian/libswt-gtk-3.5-jni.install b/debian/libswt-gtk-3.5-jni.install
deleted file mode 100644
index 4c5140e..0000000
--- a/debian/libswt-gtk-3.5-jni.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/jni/libswt-*[0-9].so
diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
new file mode 100644
index 0000000..09080a3
--- /dev/null
+++ b/debian/patches/libgnomeproxy.patch
@@ -0,0 +1,53 @@
+--- a/build.xml 2009-10-12 17:24:57.233753051 +0200
++++ b/build.xml 2009-10-12 17:27:50.017755737 +0200
+@@ -50,6 +50,9 @@
+ </or>
+ </and>
+ </condition>
++ <condition property="build.libgnomeproxy">
++ <equals arg1="${buildArch}" arg2="x86" />
++ </condition>
+
+ <target name="setLib64Dir" if="setLib64">
+ <property name="libDir" value="lib64" />
+@@ -285,8 +288,14 @@
+ <echo file="testsbuild-stamp" />
+ </target>
+
++ <target name="compile.libgnomeproxy" if="build.libgnomeproxy">
++ <!-- build libgnomeproxy -->
++ <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
++ <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
++ <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
++ </target>
++
+ <target name="compilelibs" unless="compilelibs.complete">
+- <!-- TODO: Reenable when libgnomeproxy build is fixed.
+ <delete verbose="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
+ <include name="eclipse" />
+@@ -294,7 +303,7 @@
+ <fileset dir="${buildDirectory}">
+ <include name="**/*.so" />
+ </fileset>
+- </delete>-->
++ </delete>
+ <ant antfile="build.xml"
+ target="build.nativeLibraries"
+ dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+@@ -317,14 +326,7 @@
+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
+ <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
+ </move>
+- <!-- build libgnomeproxy -->
+- <!-- TODO: Reenable when libgnomeproxy build is fixed.
+- <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
+- <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/">
+- </copy>
+- <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/">
+- </move>-->
+- <!-- build libupdate -->
++ <antcall target="compile.libgnomeproxy" />
+ <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+
+ <echo file="compilelibs-stamp" />
diff --git a/debian/patches/series b/debian/patches/series
index 8e1779e..a985a27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
eclipse-build.patch
fix-perm.patch
+symlink.patch
+libgnomeproxy.patch
diff --git a/debian/patches/symlink.patch b/debian/patches/symlink.patch
new file mode 100644
index 0000000..f09bde2
--- /dev/null
+++ b/debian/patches/symlink.patch
@@ -0,0 +1,22 @@
+Description: Patch to generate the "startup.jar" symlink using the upstream code. Sent upstream!
+Author: Niels Thykier <niels at thykier.net>
+
+Index: build.xml
+===================================================================
+--- a/build.xml (revision 23414)
++++ b/build.xml (working copy)
+@@ -683,6 +683,14 @@
+ <!-- eclipse binary -->
+ <mkdir dir="${destDir}${prefix}/bin" />
+ <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
++ <!-- Create the "startup.jar" symlink -->
++ <exec executable="/bin/sh" dir="${destDir}${prefix}/${libDir}/eclipse" outputproperty="eclipse.launcher.jar.path"
++ failonerror="true" >
++ <arg value="-c" />
++ <arg value="echo plugins/org.eclipse.equinox.launcher_*" />
++ </exec>
++ <symlink link="${destDir}${prefix}/${libDir}/eclipse/startup.jar" resource="${eclipse.launcher.jar.path}" />
++
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
+ </target>
+
diff --git a/debian/rules b/debian/rules
index 3db6222..9a05164 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,17 @@ install/eclipse-platform::
$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar /usr/lib/eclipse/plugins)
+binary-post-install/eclipse-rcp::
+ # This script is stored in a patch, so the exec bit is not set the first time.
+ test -x swt_bundle.sh || chmod a+x swt_bundle.sh
+ # Extract swt's bundle from eclipse-rcp where all the other bundles are installed.
+ $(DEB_ANT_INVOKE) -Dprefix=/usr -Dlibdir=/lib -Declipse.rcp.package.root=debian/eclipse-rcp/ \
+ -Declipse.swt.package.root=debian/libswt-gtk-3.5-jni package.extract.swt
+ # Remove outdated libraries or else shlibdeps will fail later.
+ rm -f debian/libswt-gtk-3.5-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc*
+ mkdir -p debian/libswt-gtk-3.5-jni/usr/lib/jni
+ cd debian/libswt-gtk-3.5-jni/usr/lib/jni && find ../eclipse/configuration/ -name '*.so' -exec ln -s {} . \;
+
# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
# move images from /usr/lib to /usr/share
@@ -119,21 +130,24 @@ debian-install-stamp:
-metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
-application org.eclipse.equinox.initializer.configInitializer \
- -fileInitializer $(CURDIR)/debian/patterns.txt
- # Copy SWT *.so files
- mkdir -p $(DEB_DESTDIR)usr/lib/jni
- cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/*.so $(DEB_DESTDIR)usr/lib/jni
- rm -f $(DEB_DESTDIR)usr/lib/jni/libswt-mozilla-gcc*
+ -fileInitializer $(CURDIR)/debian/extract_patterns.txt
# Copy SWT jar file
mkdir -p $(DEB_DESTDIR)usr/lib/java
cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/swt.jar \
$(DEB_DESTDIR)usr/lib/java/swt-gtk-3.5.jar
- # Die friend of the old ages.
- rm -f debian/*/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc3-gtk-*.so
# Normalize the paths.
- grep -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
- TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep -l -I -r debian_tmp debian/tmp/ | xargs sed -i s@$${TO_CORRECT}@@g
+ grep --exclude-from=debian/exclude_patterns.txt -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
+ TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep --exclude-from=debian/exclude_patterns.txt \
+ -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
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
+ # Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
+ sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
\ No newline at end of file
diff --git a/debian/sys-jars b/debian/sys-jars
new file mode 100644
index 0000000..46a5304
--- /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.
More information about the pkg-java-commits
mailing list