[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. 67f90df48a638faaf8f22ab5458d5a5c3fde5c4a
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Oct 14 22:25:59 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 67f90df48a638faaf8f22ab5458d5a5c3fde5c4a (commit)
from fb76c7b3c7f1d691b9329f819ec2755333b93d66 (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 67f90df48a638faaf8f22ab5458d5a5c3fde5c4a
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Oct 15 00:25:34 2009 +0200
Select safe changes for karmic.
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 46 ++++++++++++++-----------
debian/control | 54 ++++++++++++++++-------------
debian/eclipse-jdt.install | 1 +
debian/eclipse-pde.install | 1 +
debian/eclipse-platform.install | 8 ++++-
debian/eclipse-plugin-cvs.install | 7 +++-
debian/eclipse-rcp.install | 3 +-
debian/extra/eclipse | 2 +-
debian/extra/imagemv.sh | 4 +-
debian/extra/plugin-linker.sh | 23 -------------
debian/libequniox-osgi-java.install | 3 ++
debian/patches/gnomemakefile-patch.patch | 19 ++++++++++
debian/patches/gnomeproxy-makefile.patch | 19 ++++++++++
debian/patches/libgnomeproxy.patch | 22 ++++++++----
debian/patches/series | 5 ++-
debian/rules | 19 +++++++----
debian/sys-jars | 8 ----
17 files changed, 144 insertions(+), 100 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index afa8dcf..ac38b4a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,27 +1,31 @@
-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.
+debian/control:
+ - Look at correcting debian/extra/eclipse.sh to support
+ xdialog or Xdialog and add that as alternative to zenity | kdebase-bin
Things that needs fixing:
- - 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).
+ - 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).
+
Expose eclipse jars:
- libjibx-java depends on some eclipse jars (beyond what is available in libecj-java).
+ Apparently libjibx-java is needed by openjdk7 and 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/control b/debian/control
index e8dc8b8..bfa4de3 100644
--- a/debian/control
+++ b/debian/control
@@ -11,22 +11,14 @@ 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,
@@ -43,7 +35,8 @@ Homepage: http://www.eclipse.org/
Package: eclipse
Architecture: any
-Depends: eclipse-jdt,
+Depends: default-jre | java1-runtime | java2-runtime,
+ eclipse-jdt,
eclipse-pde,
eclipse-plugin-cvs,
${misc:Depends}
@@ -60,10 +53,8 @@ Description: Extensible Tool Platform and Java IDE
Package: eclipse-jdt
Architecture: any
Depends: ant-optional,
+ default-jre | java1-runtime | java2-runtime,
eclipse-platform (= ${binary:Version}),
- junit (>= 3.8.2),
- junit4,
- libhamcrest-java,
${misc:Depends}
Suggests: eclipse
Description: Eclipse Java Development Tools (JDT)
@@ -80,7 +71,8 @@ Description: Eclipse Java Development Tools (JDT)
Package: eclipse-pde
Architecture: any
-Depends: eclipse-jdt (= ${binary:Version}),
+Depends: default-jre | java1-runtime | java2-runtime,
+ eclipse-jdt (= ${binary:Version}),
eclipse-platform (= ${binary:Version}),
${misc:Depends}
Suggests: eclipse
@@ -99,13 +91,8 @@ 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.5-java,
libswt-gtk-3.5-java (= ${binary:Version}),
+ xulrunner-1.9.1,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
@@ -157,8 +144,9 @@ Description: Eclipse platform without plug-ins to develop any language (data)
This package contains the architecture-independent data files.
Package: eclipse-plugin-cvs
-Depends: eclipse-platform (= ${binary:Version}),
- cvs (>= 1.12.13-8),
+Depends: cvs (>= 1.12.13-8),
+ default-jre | java1-runtime | java2-runtime,
+ eclipse-platform (= ${binary:Version}),
${misc:Depends}
Architecture: any
Description: Eclipse Team Integration (CVS support)
@@ -173,7 +161,9 @@ Description: Eclipse Team Integration (CVS support)
Package: eclipse-rcp
Architecture: any
-Depends: libswt-gtk-3.5-java (= ${binary:Version}),
+Depends: default-jre | java1-runtime | java2-runtime,
+ libequniox-osgi-java (= ${binary:Version}),
+ libswt-gtk-3.5-java (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Suggests: eclipse
@@ -194,9 +184,24 @@ Description: Eclipse Rich Client Platform (RCP)
.
This package is the basis for all Eclipse applications.
+Package: libequniox-osgi-java
+Architecture: any
+Depends: default-jre | java1-runtime | java2-runtime,
+ ${misc:Depends}
+Description: Equniox OSGi framework
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ This package includes only the Eclipse Equniox OSGi framework, which can
+ be used outside Eclipse.
+
Package: libswt-gtk-3.5-java
Architecture: any
-Depends: java-common (>= 0.23),
+Depends: default-jre | java1-runtime | java2-runtime,
+ java-common (>= 0.23),
libswt-gtk-3.5-jni (= ${binary:Version}),
${misc:Depends}
Conflicts: libswt3.2-java
@@ -221,7 +226,8 @@ Description: Standard Widget Toolkit for Java, GTK+ version
Package: libswt-gtk-3.5-jni
Architecture: any
-Depends: ${shlibs:Depends},
+Depends: default-jre | java1-runtime | java2-runtime,
+ ${shlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
Conflicts: libswt3.2-jni
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index c87d28e..67ea397 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -16,6 +16,7 @@ usr/lib/eclipse/plugins/org.eclipse.jdt.junit.runtime_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt.junit4.runtime_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt.junit_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt.launching_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jdt.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.jdt_*.jar
usr/lib/eclipse/plugins/org.hamcrest.core_*.jar
diff --git a/debian/eclipse-pde.install b/debian/eclipse-pde.install
index 07777ea..67a0278 100644
--- a/debian/eclipse-pde.install
+++ b/debian/eclipse-pde.install
@@ -9,6 +9,7 @@ usr/lib/eclipse/plugins/org.eclipse.pde.ds.core_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.ds.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.junit.runtime_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.runtime_*.jar
+usr/lib/eclipse/plugins/org.eclipse.pde.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.ua.core_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.ua.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.pde.ui.templates_*.jar
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 1abb5e3..9be0c7a 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -4,6 +4,8 @@ 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.help.source_*
+usr/lib/eclipse/features/org.eclipse.help_*
usr/lib/eclipse/features/org.eclipse.platform.source_*
usr/lib/eclipse/features/org.eclipse.platform_*
usr/lib/eclipse/features/org.eclipse.sdk_*
@@ -78,7 +80,9 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.security.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.security_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*.jar
usr/lib/eclipse/plugins/org.eclipse.help.appserver_*.jar
+usr/lib/eclipse/plugins/org.eclipse.help.base.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.help.base_*.jar
+usr/lib/eclipse/plugins/org.eclipse.help.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.help.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.help.webapp_*.jar
usr/lib/eclipse/plugins/org.eclipse.help_*.jar
@@ -87,9 +91,9 @@ usr/lib/eclipse/plugins/org.eclipse.jsch.core_*.jar
usr/lib/eclipse/plugins/org.eclipse.jsch.ui_*.jar
usr/lib/eclipse/plugins/org.eclipse.ltk.core.refactoring_*.jar
usr/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
usr/lib/eclipse/plugins/org.eclipse.platform.doc.isv_*.jar
usr/lib/eclipse/plugins/org.eclipse.platform.doc.user_*.jar
+usr/lib/eclipse/plugins/org.eclipse.platform.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.platform_*
usr/lib/eclipse/plugins/org.eclipse.sdk_*
usr/lib/eclipse/plugins/org.eclipse.search_*.jar
@@ -125,3 +129,5 @@ usr/lib/eclipse/plugins/org.sat4j.core_*.jar
usr/lib/eclipse/plugins/org.sat4j.pb_*.jar
usr/lib/eclipse/startup.jar
usr/share/applications
+usr/share/eclipse/features/org.eclipse.help.source_*
+usr/share/eclipse/features/org.eclipse.help_*
diff --git a/debian/eclipse-plugin-cvs.install b/debian/eclipse-plugin-cvs.install
index 6d399aa..53b3b3f 100644
--- a/debian/eclipse-plugin-cvs.install
+++ b/debian/eclipse-plugin-cvs.install
@@ -1,5 +1,10 @@
-usr/lib/eclipse/plugins/org.eclipse.cvs_*
+usr/lib/eclipse/features/org.eclipse.cvs.source_*
+usr/lib/eclipse/features/org.eclipse.cvs_*
+usr/lib/eclipse/plugins/org.eclipse.cvs.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.cvs_*.jar
usr/lib/eclipse/plugins/org.eclipse.team.cvs.core_*.jar
usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh2_*.jar
usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh_*.jar
usr/lib/eclipse/plugins/org.eclipse.team.cvs.ui_*.jar
+usr/share/eclipse/features/org.eclipse.cvs.source_*
+usr/share/eclipse/features/org.eclipse.cvs_*
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index 9a0142a..bb88384 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -23,8 +23,7 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.util_*.jar
usr/lib/eclipse/plugins/org.eclipse.jface.databinding_*.jar
usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
+usr/lib/eclipse/plugins/org.eclipse.rcp.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.rcp_*.jar
usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
usr/lib/eclipse/plugins/org.eclipse.ui_*.jar
diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 8a8bef4..0191fc0 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -1,4 +1,4 @@
#!/bin/sh
-xuldir=/usr/lib/xulrunner-$(/usr/bin/xulrunner --gre-version)
+xuldir=/usr/lib/xulrunner-$(/usr/bin/xulrunner-1.9.1 --gre-version)
LD_LIBRARY_PATH=$xuldir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} /usr/lib/eclipse/eclipse "$@"
diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index 99260dd..b75dc18 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 "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
-ln -s "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
+mv -vf "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
+ln -sf "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
diff --git a/debian/extra/plugin-linker.sh b/debian/extra/plugin-linker.sh
deleted file mode 100644
index ef19210..0000000
--- a/debian/extra/plugin-linker.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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/libequniox-osgi-java.install b/debian/libequniox-osgi-java.install
new file mode 100644
index 0000000..ab23147
--- /dev/null
+++ b/debian/libequniox-osgi-java.install
@@ -0,0 +1,3 @@
+usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
+usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
+usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
diff --git a/debian/patches/gnomemakefile-patch.patch b/debian/patches/gnomemakefile-patch.patch
new file mode 100644
index 0000000..2094247
--- /dev/null
+++ b/debian/patches/gnomemakefile-patch.patch
@@ -0,0 +1,19 @@
+diff --git a/patches/gnomeproxy-makefile.patch b/patches/gnomeproxy-makefile.patch
+index e69de29..885993e 100644
+--- a/patches/gnomeproxy-makefile.patch
++++ b/patches/gnomeproxy-makefile.patch
+@@ -0,0 +1,14 @@
++Index: build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile
++===================================================================
++--- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 22:36:19.965754808 +0200
+++++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 23:01:39.375006881 +0200
++@@ -18,7 +18,8 @@
++ LIB_NAME = gnomeproxy.so
++ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
++
++-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+++INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ \
+++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++ COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
++
++ LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
diff --git a/debian/patches/gnomeproxy-makefile.patch b/debian/patches/gnomeproxy-makefile.patch
new file mode 100644
index 0000000..812797c
--- /dev/null
+++ b/debian/patches/gnomeproxy-makefile.patch
@@ -0,0 +1,19 @@
+diff --git a/patches/gnomeproxy-makefile.patch b/patches/gnomeproxy-makefile.patch
+index e69de29..885993e 100644
+--- a/patches/gnomeproxy-makefile.patch
++++ b/patches/gnomeproxy-makefile.patch
+@@ -0,0 +1,14 @@
++Index: build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile
++===================================================================
++--- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 22:36:19.965754808 +0200
+++++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 23:01:39.375006881 +0200
++@@ -18,7 +18,8 @@
++ LIB_NAME = gnomeproxy.so
++ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
++
++-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+++INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ \
+++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++ COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
++
++ LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
index 09080a3..2d43f32 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,5 +1,5 @@
---- a/build.xml 2009-10-12 17:24:57.233753051 +0200
-+++ b/build.xml 2009-10-12 17:27:50.017755737 +0200
+--- a/build.xml 2009-10-14 20:51:19.853813061 +0200
++++ b/build.xml 2009-10-14 20:52:59.282880072 +0200
@@ -50,6 +50,9 @@
</or>
</and>
@@ -10,7 +10,15 @@
<target name="setLib64Dir" if="setLib64">
<property name="libDir" value="lib64" />
-@@ -285,8 +288,14 @@
+@@ -198,6 +201,7 @@
+ <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
+ <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
+ <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
++ <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
+ <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse"/>
+ <!-- end eclipse-build-only patches -->
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
+@@ -285,8 +289,14 @@
<echo file="testsbuild-stamp" />
</target>
@@ -26,7 +34,7 @@
<delete verbose="true">
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
<include name="eclipse" />
-@@ -294,7 +303,7 @@
+@@ -294,7 +304,7 @@
<fileset dir="${buildDirectory}">
<include name="**/*.so" />
</fileset>
@@ -35,7 +43,7 @@
<ant antfile="build.xml"
target="build.nativeLibraries"
dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
-@@ -317,14 +326,7 @@
+@@ -317,13 +327,6 @@
<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>
@@ -46,8 +54,6 @@
- </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" />
+ <!-- build libupdate -->
<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 a985a27..9ccbe04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
eclipse-build.patch
-fix-perm.patch
-symlink.patch
libgnomeproxy.patch
+symlink.patch
+gnomeproxy-makefile.patch
+fix-perm.patch
diff --git a/debian/rules b/debian/rules
index 9a05164..f151de9 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/libequniox-osgi-java::
+ # Do the linking.
+ mkdir -p debian/libequniox-osgi-java/usr/share/java
+ cd debian/libequniox-osgi-java/usr/share/java && \
+ for FILE in ../../lib/eclipse/plugins/* ; do \
+ ln -s $$FILE ; \
+ ln -s $$FILE `echo $$FILE | sed 's/_.*$$//g'`.jar ; \
+ done
+ # Redo this step, just in case.
+ dh_link -plibequniox-osgi-java
+
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
@@ -143,11 +154,5 @@ 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
# 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
+ sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
diff --git a/debian/sys-jars b/debian/sys-jars
deleted file mode 100644
index 46a5304..0000000
--- a/debian/sys-jars
+++ /dev/null
@@ -1,8 +0,0 @@
-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