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, oneiric has been updated
via 690102a27a06527d724986e88890d0b775e1b903 (commit)
from 0373f95faa64be5ef127087432945a893f9e1c76 (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 690102a27a06527d724986e88890d0b775e1b903
Author: Benjamin Drung <[email protected]>
Date: Thu May 26 23:02:11 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)
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 9 +++++++
debian/patches/gnomeproxy-makefile.patch | 20 ++++++++++++++++
debian/patches/gnomeproxy-pkg-config.patch | 24 ++++++++++++++++++++
debian/patches/series | 2 +
.../natives/unix/linux/makefile | 5 ++-
5 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7d332c3..d485456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+eclipse (3.5.2-10ubuntu2) oneiric; urgency=low
+
+ * 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)
+
+ -- Anders Kaseorg <[email protected]> Thu, 26 May 2011 22:19:59 +0200
+
eclipse (3.5.2-10ubuntu1) oneiric; urgency=low
* Merge from Debian unstable (LP: #780267). Remaining changes:
diff --git a/debian/patches/gnomeproxy-makefile.patch
b/debian/patches/gnomeproxy-makefile.patch
new file mode 100644
index 0000000..13b9114
--- /dev/null
+++ b/debian/patches/gnomeproxy-makefile.patch
@@ -0,0 +1,20 @@
+Description: Set Java include path for libgnomeproxy
+Origin: upstream, patches/gnomeproxy.patch
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=292078
+Last-Update: 2011-05-19
+
+---
+Index:
eclipse-3.5.2/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+===================================================================
+---
eclipse-3.5.2.orig/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2011-05-19 21:54:58.704010055 -0400
++++
eclipse-3.5.2/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2011-05-19 21:56:54.135957161 -0400
+@@ -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-pkg-config.patch
b/debian/patches/gnomeproxy-pkg-config.patch
new file mode 100644
index 0000000..a9fd2d7
--- /dev/null
+++ b/debian/patches/gnomeproxy-pkg-config.patch
@@ -0,0 +1,24 @@
+Description: Use pkg-config to find include files and libraries for
libgnomeproxy
+Author: Anders Kaseorg <[email protected]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/749218
+Last-Update: 2011-05-19
+
+---
+Index:
eclipse-3.5.2/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+===================================================================
+---
eclipse-3.5.2.orig/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2011-05-19 21:56:00.000000000 -0400
++++
eclipse-3.5.2/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2011-05-19 21:56:23.235442580 -0400
+@@ -18,11 +18,11 @@
+ 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 := $(shell pkg-config --cflags gconf-2.0 glib-2.0) \
+ -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
++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 8439669..72421ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,5 @@ bp-eclipse-help-webapps-xss-BZ661901.patch
bp-build-with-ant-1.8.2.patch
bp-ant-1.8.2-support.patch
bp-pdebuild-fixes.patch
+gnomeproxy-makefile.patch
+gnomeproxy-pkg-config.patch
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 daab01d..b6f1a43 100644
--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+++ b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
@@ -18,10 +18,11 @@ GNOMEPROXY.O = gnomeproxy.o
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 := $(shell pkg-config --cflags gconf-2.0 glib-2.0) \
+ -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
+LIBS := $(shell pkg-config --libs gconf-2.0 glib-2.0)
LINKER_FLAGS= -m32
all: link
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
