diff -Nru eclipse-3.5.2/debian/changelog eclipse-3.5.2/debian/changelog --- eclipse-3.5.2/debian/changelog 2011-07-14 16:29:33.000000000 +0100 +++ eclipse-3.5.2/debian/changelog 2011-07-18 09:03:10.000000000 +0100 @@ -1,3 +1,15 @@ +eclipse (3.5.2-11ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable (LP: #812161). Remaining changes: + - 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) + - Use xulrunner-1.9.2-dev, not xulrunner-dev, as eclipse isn't 2.0 + compatible yet. + + -- James Page Mon, 18 Jul 2011 09:02:29 +0100 + eclipse (3.5.2-11) unstable; urgency=low * Rebuild against new sat4j. (Closes: #632999) @@ -5,6 +17,23 @@ -- Niels Thykier Thu, 14 Jul 2011 17:13:19 +0200 +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 Thu, 26 May 2011 22:19:59 +0200 + +eclipse (3.5.2-10ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable (LP: #780267). Remaining changes: + - Use xulrunner-1.9.2-dev, not xulrunner-dev, as eclipse isn't 2.0 + compatible yet. + + -- Benjamin Drung Wed, 11 May 2011 01:40:57 +0200 + eclipse (3.5.2-10) unstable; urgency=low [ Benjamin Drung ] @@ -31,6 +60,28 @@ -- Niels Thykier Fri, 11 Feb 2011 14:15:40 +0100 +eclipse (3.5.2-8ubuntu3) natty; urgency=low + + * debian/control: + - Use xulrunner-1.9.2-dev, not xulrunner-dev, as eclipse isn't 2.0 + compatible yet. That and a rebuild fixes LP: #728825 + + -- Michael Terry Tue, 15 Mar 2011 11:14:51 -0400 + +eclipse (3.5.2-8ubuntu2) natty; urgency=low + + * debian/extra/eclipse: + - Actually, don't export UBUNTU_MENUPROXY=0 here because that affects + launched applications too. Instead, it is blacklisted by appmenu-gtk. + + -- Michael Terry Tue, 01 Mar 2011 12:52:55 -0500 + +eclipse (3.5.2-8ubuntu1) natty; urgency=low + + * Do not symlink ant-trax.jar, because ant 1.8.1-1 does not ship it any more. + + -- Benjamin Drung Tue, 19 Oct 2010 11:57:41 +0200 + eclipse (3.5.2-8) unstable; urgency=low [ Niels Thykier ] @@ -1261,7 +1312,7 @@ * New maintainer -- Jan Schulz Thu, 22 May 2003 17:51:23 +0200 - + eclipse (2.1-4) unstable; urgency=low * Fixed typos and other things in debian/control. (Closes: #190541, #188252) @@ -1366,9 +1417,7 @@ -- Takashi Okamoto Sun, 9 Feb 2003 15:49:26 +0900 eclipse (2.0.99_2.1M5-0.1) unstable; urgency=low - * New updtream. - -- Takashi Okamoto Sat, 8 Feb 2003 23:48:22 +0900 eclipse (2.0.2-0.4) stable; urgency=low @@ -1411,3 +1460,4 @@ * Initial Exprerimental Release. -- Takashi Okamoto Sun, 27 Oct 2002 16:27:07 +0900 + diff -Nru eclipse-3.5.2/debian/control eclipse-3.5.2/debian/control --- eclipse-3.5.2/debian/control 2011-07-14 16:12:48.000000000 +0100 +++ eclipse-3.5.2/debian/control 2011-07-15 01:30:28.000000000 +0100 @@ -1,7 +1,8 @@ Source: eclipse Section: devel Priority: optional -Maintainer: Debian Orbital Alignment Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Orbital Alignment Team Uploaders: Niels Thykier , Benjamin Drung , Adnan Hodzic @@ -42,7 +43,7 @@ sat4j (>= 2.3.0), sat4j (<< 2.3.1), unzip, - xulrunner-dev (>= 1.9.1.3-2), + xulrunner-1.9.2-dev (>= 1.9.1.3-2), zip Standards-Version: 3.9.2 DM-Upload-Allowed: yes diff -Nru eclipse-3.5.2/debian/gbp.conf eclipse-3.5.2/debian/gbp.conf --- eclipse-3.5.2/debian/gbp.conf 2011-05-10 16:01:39.000000000 +0100 +++ eclipse-3.5.2/debian/gbp.conf 2011-07-15 01:30:28.000000000 +0100 @@ -1,2 +1,3 @@ [DEFAULT] compression=bzip2 +debian-branch=oneiric diff -Nru eclipse-3.5.2/debian/patches/gnomeproxy-makefile.patch eclipse-3.5.2/debian/patches/gnomeproxy-makefile.patch --- eclipse-3.5.2/debian/patches/gnomeproxy-makefile.patch 1970-01-01 01:00:00.000000000 +0100 +++ eclipse-3.5.2/debian/patches/gnomeproxy-makefile.patch 2011-05-26 21:18:24.000000000 +0100 @@ -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 -Nru eclipse-3.5.2/debian/patches/gnomeproxy-pkg-config.patch eclipse-3.5.2/debian/patches/gnomeproxy-pkg-config.patch --- eclipse-3.5.2/debian/patches/gnomeproxy-pkg-config.patch 1970-01-01 01:00:00.000000000 +0100 +++ eclipse-3.5.2/debian/patches/gnomeproxy-pkg-config.patch 2011-05-26 21:18:24.000000000 +0100 @@ -0,0 +1,24 @@ +Description: Use pkg-config to find include files and libraries for libgnomeproxy +Author: Anders Kaseorg +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 -Nru eclipse-3.5.2/debian/patches/series eclipse-3.5.2/debian/patches/series --- eclipse-3.5.2/debian/patches/series 2011-07-14 16:24:41.000000000 +0100 +++ eclipse-3.5.2/debian/patches/series 2011-07-15 01:30:29.000000000 +0100 @@ -28,3 +28,5 @@ 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