r2050 - in trunk/eclipse/debian: . extra
Matthias Klose
doko at costa.debian.org
Mon Apr 17 17:31:12 UTC 2006
Author: doko
Date: 2006-04-17 17:31:10 +0000 (Mon, 17 Apr 2006)
New Revision: 2050
Modified:
trunk/eclipse/debian/aot-compile
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-jdt-gcj.install
trunk/eclipse/debian/eclipse-jdt-gcj.postrm
trunk/eclipse/debian/eclipse-pde-gcj.install
trunk/eclipse/debian/eclipse-pde-gcj.postrm
trunk/eclipse/debian/eclipse-platform-gcj.install
trunk/eclipse/debian/eclipse-platform-gcj.postrm
trunk/eclipse/debian/eclipse-rcp-gcj.install
trunk/eclipse/debian/eclipse-rcp-gcj.postrm
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/extra/efj.sh
trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh
trunk/eclipse/debian/libswt3.1-gtk-gcj.install
trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm
trunk/eclipse/debian/rules
Log:
* Merge from Ubuntu:
- Build using gij-4.1/gcj-4.1.
Modified: trunk/eclipse/debian/aot-compile
===================================================================
--- trunk/eclipse/debian/aot-compile 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/aot-compile 2006-04-17 17:31:10 UTC (rev 2050)
@@ -6,7 +6,7 @@
import sys
import zipfile
-GCJ = "/usr/bin/gcj-4.0"
+GCJ = "/usr/bin/gcj-4.1"
GCJFLAGS = [ '-O2', "-fPIC", "-findirect-dispatch", "-fjni"]
LDFLAGS = ["-Wl,-Bsymbolic"]
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/changelog 2006-04-17 17:31:10 UTC (rev 2050)
@@ -19,10 +19,13 @@
* debian/rules: Set a default for MOZILLA_HOME.
* Set JAVA_HOME for the build (needed for non-matching gcc/gcj versions).
* debian/eclipse.menu: Set longtitle. Ubuntu #34916.
- * Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991.
- * Add a new package libswt3.1-gtk-gcj.
+ * Merge from Ubuntu:
+ - Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991.
+ - Add a new package libswt3.1-gtk-gcj.
* ecj.sh: Only access /etc/eclipse/java_home, if it exists. Closes: #356027.
* eclipse.sh: s/source/./. Closes: #359945.
+ * Merge from Ubuntu:
+ - Build using gij-4.1/gcj-4.1.
-- Michael Koch <konqueror at gmx.de> Wed, 15 Mar 2006 17:03:01 +0000
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/control 2006-04-17 17:31:10 UTC (rev 2050)
@@ -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, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.54), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
Standards-Version: 3.6.2
Package: eclipse-rcp
@@ -246,7 +246,7 @@
Package: libswt3.1-gtk-gcj
Architecture: any
-Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.0
+Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.1
Replaces: eclipse-rcp-gcj (<< 3.1.2-2)
Conflicts: eclipse-rcp-gcj (<< 3.1.2-2)
Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
@@ -280,7 +280,7 @@
Package: eclipse-ecj-gcj
Architecture: any
-Depends: gij-4.0, ${shlibs:Depends}
+Depends: gij-4.1, ${shlibs:Depends}
Provides: java-compiler, java2-compiler
Conflicts: eclipse-javac
Description: Native version of the Eclipse Java compiler
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/control.in 2006-04-17 17:31:10 UTC (rev 2050)
@@ -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, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.54), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
Standards-Version: 3.6.2
Package: eclipse-rcp
@@ -246,7 +246,7 @@
Package: libswt3.1-gtk-gcj
Architecture: any
-Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.0
+Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.1
Replaces: eclipse-rcp-gcj (<< 3.1.2-2)
Conflicts: eclipse-rcp-gcj (<< 3.1.2-2)
Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
@@ -280,7 +280,7 @@
Package: eclipse-ecj-gcj
Architecture: any
-Depends: gij-4.0, ${shlibs:Depends}
+Depends: gij-4.1, ${shlibs:Depends}
Provides: java-compiler, java2-compiler
Conflicts: eclipse-javac
Description: Native version of the Eclipse Java compiler
Modified: trunk/eclipse/debian/eclipse-jdt-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.install 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.install 2006-04-17 17:31:10 UTC (rev 2050)
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ant.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.launching_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug_*/jdi.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug_*/jdimodel.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.junit_*/junitsupport.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.junit_*
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ant.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.launching_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug_*/jdi.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug_*/jdimodel.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.junit_*/junitsupport.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.junit_*
Modified: trunk/eclipse/debian/eclipse-jdt-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.postrm 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.postrm 2006-04-17 17:31:10 UTC (rev 2050)
@@ -4,7 +4,7 @@
{
# Merges per-package classmap databases into the system-wide classmap database.
- gccversion=4.0
+ gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/eclipse-pde-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.install 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-pde-gcj.install 2006-04-17 17:31:10 UTC (rev 2050)
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.runtime_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.build_*/pdebuild.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.junit.runtime_*/pdejunit.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.runtime_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.build_*/pdebuild.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.junit.runtime_*/pdejunit.jar.so
Modified: trunk/eclipse/debian/eclipse-pde-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.postrm 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-pde-gcj.postrm 2006-04-17 17:31:10 UTC (rev 2050)
@@ -4,7 +4,7 @@
{
# Merges per-package classmap databases into the system-wide classmap database.
- gccversion=4.0
+ gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/eclipse-platform-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.install 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-platform-gcj.install 2006-04-17 17:31:10 UTC (rev 2050)
@@ -1,51 +1,51 @@
-debian/tmp/usr/lib/gcj-4.0/org.apache.lucene_*
+debian/tmp/usr/lib/gcj-4.1/org.apache.lucene_*
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform_*/platform.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform_*/startup.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ant.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.compare_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.boot_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.filebuffers_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources.compatibility_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.runtime.compatibility_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.variables_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.debug.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.debug.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.appserver_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.base_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.webapp_*
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jface.text_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ltk.core.refactoring_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ltk.ui.refactoring_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi.services_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi.util_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.search_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.text_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.tomcat_*/*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.browser_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.cheatsheets_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.console_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.editors_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.externaltools_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.forms_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.ide_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.intro_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.presentations.r21_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.views_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench.texteditor_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.scheduler_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources.linux_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.core.linux_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform_*/platform.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform_*/startup.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ant.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.compare_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.boot_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.filebuffers_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources.compatibility_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.runtime.compatibility_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.variables_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.debug.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.debug.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.appserver_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.base_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.webapp_*
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jface.text_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ltk.core.refactoring_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ltk.ui.refactoring_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi.services_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi.util_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.search_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.text_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.tomcat_*/*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.browser_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.cheatsheets_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.console_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.editors_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.externaltools_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.forms_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.ide_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.intro_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.presentations.r21_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.views_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench.texteditor_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.scheduler_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources.linux_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.core.linux_*.jar.so
Modified: trunk/eclipse/debian/eclipse-platform-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.postrm 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-platform-gcj.postrm 2006-04-17 17:31:10 UTC (rev 2050)
@@ -4,7 +4,7 @@
{
# Merges per-package classmap databases into the system-wide classmap database.
- gccversion=4.0
+ gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/eclipse-rcp-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.install 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.install 2006-04-17 17:31:10 UTC (rev 2050)
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.rcp_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.commands_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.expressions_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.runtime_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.help_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.jface_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.configurator_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.rcp_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.commands_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.expressions_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.runtime_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.help_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.jface_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.swt_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.configurator_*.jar.so
Modified: trunk/eclipse/debian/eclipse-rcp-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.postrm 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.postrm 2006-04-17 17:31:10 UTC (rev 2050)
@@ -4,7 +4,7 @@
{
# Merges per-package classmap databases into the system-wide classmap database.
- gccversion=4.0
+ gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/extra/eclipse.sh 2006-04-17 17:31:10 UTC (rev 2050)
@@ -155,6 +155,6 @@
-startup "${STARTUP}" \
${CMDLINEARGS} \
-vmargs -Djava.library.path=/usr/lib/jni \
- -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
+ -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.1/classmap.db \
-Dgnu.gcj.runtime.VMClassLoader.library_control=never \
-Dosgi.locking=none ${VMARGS}
Modified: trunk/eclipse/debian/extra/efj.sh
===================================================================
--- trunk/eclipse/debian/extra/efj.sh 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/extra/efj.sh 2006-04-17 17:31:10 UTC (rev 2050)
@@ -37,7 +37,7 @@
# Load default settings from the user's configuration file.
if [ -f ~/.eclipse/eclipserc ]; then
- source ~/.eclipse/eclipserc
+ . ~/.eclipse/eclipserc
fi
# Process the command line options. These override the eclipserc file, so we do
@@ -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.0/classmap.db \
+ -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.1/classmap.db \
-Dgnu.gcj.runtime.VMClassLoader.library_control=never \
-Dosgi.locking=none ${VMARGS}
Modified: trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh 2006-04-17 17:31:10 UTC (rev 2050)
@@ -2,7 +2,7 @@
# Merges per-package classmap databases into the system-wide classmap database.
-gccversion=4.0
+gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/libswt3.1-gtk-gcj.install
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-gcj.install 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/libswt3.1-gtk-gcj.install 2006-04-17 17:31:10 UTC (rev 2050)
@@ -1,2 +1,2 @@
debian/tmp/usr/sbin/update-gcj-classmaps-eclipse
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt.gtk.linux.*_*.jar.so
+debian/tmp/usr/lib/gcj-4.1/org.eclipse.swt.gtk.linux.*_*.jar.so
Modified: trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm 2006-04-17 17:31:10 UTC (rev 2050)
@@ -4,7 +4,7 @@
{
# Merges per-package classmap databases into the system-wide classmap database.
- gccversion=4.0
+ gccversion=4.1
gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
classmapd=/usr/share/gcj-${gccversion}/classmap.d
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-04-17 17:04:22 UTC (rev 2049)
+++ trunk/eclipse/debian/rules 2006-04-17 17:31:10 UTC (rev 2050)
@@ -46,7 +46,7 @@
# GCJ configuration
# GCJ_RUN command line to launch gcj
# AOT_COMPILE command line to AOT compile jars to native
-GCJ_VERSION=4.0
+GCJ_VERSION=4.1
GCJ_RUN=/usr/bin/gcj-$(GCJ_VERSION)
GCJ_DBTOOL=/usr/bin/gcj-dbtool-$(GCJ_VERSION)
GCJ_JARDIR=/usr/lib/gcj-$(GCJ_VERSION)
More information about the pkg-java-commits
mailing list