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-3.6 has been updated via 81cf81d814ccb916c3389daf0585a692fd4e045f (commit) via 78aec30451f2d297a8603e967b95c034983d99c4 (commit) via 772857a338f41ea878bdc9460bd1f569b59cd4dd (commit) from 833f4e68f171c395f0724e83c604020675b95224 (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 81cf81d814ccb916c3389daf0585a692fd4e045f Author: Niels Thykier <ni...@thykier.net> Date: Fri May 27 21:46:26 2011 +0200 Released to experimental commit 78aec30451f2d297a8603e967b95c034983d99c4 Author: Niels Thykier <ni...@thykier.net> Date: Fri May 27 00:37:34 2011 +0200 Refreshed ant-1.8.2 support patch commit 772857a338f41ea878bdc9460bd1f569b59cd4dd Author: Niels Thykier <ni...@thykier.net> Date: Fri May 27 00:31:49 2011 +0200 Fix FTBFS on i386. * debian/patches/gnomeproxy-makefile.patch: Set Java include path for libgnomeproxy. * debian/patches/gnomeproxy-pkg-config.patch: Use pkg-config to find include files and libraries for libgnomeproxy. (LP: #749218) Conflicts: debian/changelog debian/patches/series ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- debian/patches/bp-ant-1.8.2-support.patch | 2 +- debian/patches/gnomeproxy-pkg-config.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fde1a34..54b3b63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ -eclipse (3.6.2-1) UNRELEASED; urgency=low +eclipse (3.6.2~exp-1) experimental; urgency=low + + [ Anders Kaseorg ] + * debian/patches/gnomeproxy-pkg-config.patch: Use pkg-config to find + include files and libraries for libgnomeproxy. (LP: #749218) [ Benjamin Drung ] * New upstream version (Closes: #587742, LP: #604390). diff --git a/debian/patches/bp-ant-1.8.2-support.patch b/debian/patches/bp-ant-1.8.2-support.patch index 838e4a9..f7d51f3 100644 --- a/debian/patches/bp-ant-1.8.2-support.patch +++ b/debian/patches/bp-ant-1.8.2-support.patch @@ -17,7 +17,7 @@ diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml index 6dc9b5d..85f3442 100644 --- a/build.xml +++ b/build.xml -@@ -315,6 +315,7 @@ +@@ -317,6 +317,7 @@ <!-- end eclipse-build-only patches --> <!-- back-ported patches --> <patch patchfile="${basedir}/patches/bz319476-compile-jar-in-jar-loader.patch" dir="${buildDirectory}/plugins/org.eclipse.jdt.ui" strip="0" /> diff --git a/debian/patches/gnomeproxy-pkg-config.patch b/debian/patches/gnomeproxy-pkg-config.patch new file mode 100644 index 0000000..c08ef16 --- /dev/null +++ b/debian/patches/gnomeproxy-pkg-config.patch @@ -0,0 +1,22 @@ +Description: Use pkg-config to find include files and libraries for libgnomeproxy +Author: Anders Kaseorg <ande...@mit.edu> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/749218 +Last-Update: 2011-05-19 + +diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile +index 0aa0cbe..ff2a54c 100644 +--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile ++++ b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile +@@ -20,10 +20,10 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so + + OS_TYPE = linux + JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} +-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 = $(shell pkg-config --cflags gconf-2.0 glib-2.0) + 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 ++LIBS := $(shell pkg-config --libs gconf-2.0 glib-2.0) + LINKER_FLAGS= -m32 + + all: link diff --git a/debian/patches/series b/debian/patches/series index 68b4809..18a1645 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ eclipse-build-generatedScripts.patch generate-metadata-and-extract-swt-libraries.patch bp-ant-1.8.2-support.patch debian-load-internal-swt.patch +gnomeproxy-pkg-config.patch hooks/post-receive -- eclipse - Powerful IDE written in java - Debian package. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits