diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/changelog /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/changelog --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/changelog 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/changelog 2007-09-09 21:40:38.000000000 +0100 @@ -1,3 +1,11 @@ +eclipse (3.2.2-3ubuntu2) gutsy; urgency=low + + * In eclipse-awt-libpath.dpatch added paths to fix ppc build. + * Fix build on lpia. + * Move to gcj-4.2. + + -- Flávio Martins Sun, 09 Sep 2007 21:20:21 +0100 + eclipse (3.2.2-3ubuntu1) gutsy; urgency=low * In debian/control and debian/rules change from xulrunner to firefox diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/control /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/control --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/control 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/control 2007-09-09 21:40:38.000000000 +0100 @@ -201,7 +201,7 @@ Package: libswt3.2-gtk-gcj Architecture: any -Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.1 +Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.2 Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version) diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/control.in /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/control.in --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/control.in 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/control.in 2007-09-09 21:40:38.000000000 +0100 @@ -201,7 +201,7 @@ Package: libswt3.2-gtk-gcj Architecture: any -Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.1 +Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.2 Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version) diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/extra/eclipse.sh /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/extra/eclipse.sh --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/extra/eclipse.sh 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/extra/eclipse.sh 2007-09-09 21:40:38.000000000 +0100 @@ -173,6 +173,6 @@ -startup "${STARTUP}" \ ${CMDLINEARGS} \ -vmargs -Djava.library.path=/usr/lib/jni \ - -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.1/classmap.db \ + -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.2/classmap.db \ -Dgnu.gcj.runtime.VMClassLoader.library_control=never \ -Dosgi.locking=none ${VMARGS} diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/extra/efj.sh /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/extra/efj.sh --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/extra/efj.sh 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/extra/efj.sh 2007-09-09 21:40:38.000000000 +0100 @@ -136,6 +136,6 @@ -application org.eclipse.jdt.core.JavaCodeFormatter \ ${1+"$@"} \ -vmargs -Djava.library.path=/usr/lib/jni \ - -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.1/classmap.db \ + -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.2/classmap.db \ -Dgnu.gcj.runtime.VMClassLoader.library_control=never \ -Dosgi.locking=none ${VMARGS} diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/patches/eclipse-awt-libpath.dpatch /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/patches/eclipse-awt-libpath.dpatch --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/patches/eclipse-awt-libpath.dpatch 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/patches/eclipse-awt-libpath.dpatch 2007-09-09 21:40:38.000000000 +0100 @@ -23,12 +23,15 @@ @DPATCH@ --- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~ 2006-10-16 12:14:04.218388000 +0200 +++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-10-16 12:52:27.888388000 +0200 -@@ -115,6 +115,9 @@ +@@ -115,6 +115,12 @@ if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH} export AWT_LIB_PATH -+ elif [ -d /usr/lib/gcj-4.1 ]; then -+ AWT_LIB_PATH=/usr/lib/gcj-4.1 ++ elif [ -d /usr/lib/gcj-4.2 ]; then ++ AWT_LIB_PATH=/usr/lib/gcj-4.2 ++ export AWT_LIB_PATH ++ elif [ -d ${JAVA_HOME}/lib ]; then ++ AWT_LIB_PATH=${JAVA_HOME}/lib + export AWT_LIB_PATH else AWT_LIB_PATH=${JAVA_HOME}/jre/bin diff -Nru /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/rules /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/rules --- /tmp/q1T8kvqFsd/eclipse-3.2.2/debian/rules 2007-09-09 21:40:32.000000000 +0100 +++ /tmp/EsGjH7aV8n/eclipse-3.2.2/debian/rules 2007-09-09 21:40:38.000000000 +0100 @@ -22,6 +22,10 @@ enable_native=yes ECLIPSE_PLATFORM=x86 endif +ifeq ($(DEB_HOST_ARCH),lpia) + enable_native=yes + ECLIPSE_PLATFORM=x86 +endif ifeq ($(DEB_HOST_ARCH),ia64) enable_native=yes ECLIPSE_PLATFORM=ia64 @@ -63,7 +67,7 @@ # GCJ configuration # GCJ_RUN command line to launch gcj # AOT_COMPILE command line to AOT compile jars to native -GCJ_VERSION=4.1 +GCJ_VERSION=4.2 GCJ_RUN=/usr/bin/gcj-$(GCJ_VERSION) GCJ_DBTOOL=/usr/bin/gcj-dbtool-$(GCJ_VERSION) GCJ_JARDIR=/usr/lib/gcj/eclipse