[pkg-java] r4258 - in trunk/eclipse/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Mon Sep 24 20:35:25 UTC 2007
Author: mkoch
Date: 2007-09-24 20:35:25 +0000 (Mon, 24 Sep 2007)
New Revision: 4258
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
trunk/eclipse/debian/rules
Log:
* Updated Depends on jsch.
* Remove *lucene*.jar from native compilation.
* Introduce build option 'nonative' to disable native compilation easily.
* Make eclipse-gcj depend on ecj-gcj instead of ecj-bootstrap-gcj.
* Added support for lpia architecture
* Fix powerpc FTBFS issue for real now. Closes: #432648
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-09-23 09:34:35 UTC (rev 4257)
+++ trunk/eclipse/debian/changelog 2007-09-24 20:35:25 UTC (rev 4258)
@@ -1,10 +1,19 @@
eclipse (3.2.2-4) UNRELEASED; urgency=low
+ [ Michael Koch ]
* Use GCJ 4.2.
* Added debian/patches/eclipse-jsch-sftpexception.dpatch. Closes: #443485.
+ * Updated Depends on jsch.
+ * Remove *lucene*.jar from native compilation.
+ * Introduce build option 'nonative' to disable native compilation easily.
- -- Michael Koch <konqueror at gmx.de> Sat, 22 Sep 2007 07:54:07 +0200
+ [ Flávio Martins ]
+ * Make eclipse-gcj depend on ecj-gcj instead of ecj-bootstrap-gcj.
+ * Added support for lpia architecture
+ * Fix powerpc FTBFS issue for real now. Closes: #432648
+ -- Michael Koch <konqueror at gmx.de> Mon, 24 Sep 2007 07:43:22 +0200
+
eclipse (3.2.2-3) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2007-09-23 09:34:35 UTC (rev 4257)
+++ trunk/eclipse/debian/control 2007-09-24 20:35:25 UTC (rev 4258)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java, ${shlibs:Depends}
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), libtomcat5.5-java, ${shlibs:Depends}
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -174,7 +174,7 @@
Package: eclipse-gcj
Architecture: all
-Depends: eclipse, java-gcj-compat-dev, ecj-bootstrap-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
+Depends: eclipse, java-gcj-compat-dev, ecj-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
Description: Native Eclipse run with GCJ
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2007-09-23 09:34:35 UTC (rev 4257)
+++ trunk/eclipse/debian/control.in 2007-09-24 20:35:25 UTC (rev 4258)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@, @MOZILLA_DEP@
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), @TOMCAT_DEP@, @MOZILLA_DEP@
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -174,7 +174,7 @@
Package: eclipse-gcj
Architecture: all
-Depends: eclipse, java-gcj-compat-dev, ecj-bootstrap-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
+Depends: eclipse, java-gcj-compat-dev, ecj-gcj, eclipse-jdt-gcj, eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
Description: Native Eclipse run with GCJ
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
Modified: trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2007-09-23 09:34:35 UTC (rev 4257)
+++ trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2007-09-24 20:35:25 UTC (rev 4258)
@@ -23,13 +23,16 @@
@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.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
export AWT_LIB_PATH
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-09-23 09:34:35 UTC (rev 4257)
+++ trunk/eclipse/debian/rules 2007-09-24 20:35:25 UTC (rev 4258)
@@ -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
@@ -47,6 +51,10 @@
endif
endif
+ifneq (,$(findstring nonative,$(DEB_BUILD_OPTIONS)))
+ enable_native := no
+endif
+
SOURCE=$(shell ls upstream/eclipse*.tar.bz2)
SOURCE_ICU4J=$(shell ls upstream/icu4j*.tar.bz2)
SOURCE_JSCH=$(shell ls upstream/jsch*.tar.bz2)
@@ -573,6 +581,7 @@
*org.eclipse.jface.text) continue;; \
*org.eclipse.ui.workbench) continue;; \
*org.eclipse.ui.forms) continue;; \
+ *lucene*) continue;; \
esac; \
if [ $(DEB_HOST_ARCH) = ia64 ]; then \
case "$$jar" in \
More information about the pkg-java-commits
mailing list