Author: mkoch
Date: 2007-09-11 06:38:21 +0000 (Tue, 11 Sep 2007)
New Revision: 4151
Added:
trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/extra/efj.sh
trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
trunk/eclipse/debian/rules
Log:
eclipse (3.2.2-4) UNRELEASED; urgency=low
* Use GCJ 4.2.
* Added debian/patches/eclipse-jsch-sftpexception.dpatch.
-- Michael Koch <[EMAIL PROTECTED]> Tue, 11 Sep 2007 08:06:20 +0200
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-09-10 16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/changelog 2007-09-11 06:38:21 UTC (rev 4151)
@@ -1,3 +1,10 @@
+eclipse (3.2.2-4) UNRELEASED; urgency=low
+
+ * Use GCJ 4.2.
+ * Added debian/patches/eclipse-jsch-sftpexception.dpatch.
+
+ -- Michael Koch <[EMAIL PROTECTED]> Tue, 11 Sep 2007 08:06:20 +0200
+
eclipse (3.2.2-3) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2007-09-10 16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/control 2007-09-11 06:38:21 UTC (rev 4151)
@@ -200,7 +200,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)
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2007-09-10 16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/control.in 2007-09-11 06:38:21 UTC (rev 4151)
@@ -200,7 +200,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)
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2007-09-10 16:39:00 UTC (rev
4150)
+++ trunk/eclipse/debian/extra/eclipse.sh 2007-09-11 06:38:21 UTC (rev
4151)
@@ -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}
Modified: trunk/eclipse/debian/extra/efj.sh
===================================================================
--- trunk/eclipse/debian/extra/efj.sh 2007-09-10 16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/extra/efj.sh 2007-09-11 06:38:21 UTC (rev 4151)
@@ -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}
Modified: trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2007-09-10
16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2007-09-11
06:38:21 UTC (rev 4151)
@@ -27,8 +27,8 @@
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
else
AWT_LIB_PATH=${JAVA_HOME}/jre/bin
Added: trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
(rev 0)
+++ trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
2007-09-11 06:38:21 UTC (rev 4151)
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-jsch.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
[EMAIL PROTECTED]@
+---
source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java.orig
2007-09-11 08:04:11.000000000 +0200
++++
source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
2007-09-11 08:04:57.000000000 +0200
+@@ -882,13 +882,13 @@
+ if(attr==null){
+ try{ c.mkdir(".ssh"); } //$NON-NLS-1$
+ catch(SftpException ee){
+- setErrorMessage(ee.message);
++ setErrorMessage(ee.getMessage());
+ return;
+ }
+ }
+ try{ c.cd(".ssh"); } //$NON-NLS-1$
+ catch(SftpException ee){
+- setErrorMessage(ee.message);
++ setErrorMessage(ee.getMessage());
+ return;
+ }
+
+@@ -902,7 +902,7 @@
+ checkPermission(c, "."); // home directory //$NON-NLS-1$
+ }
+ catch(SftpException ee){
+- //setErrorMessage(debug+ee.message);
++ //setErrorMessage(debug+ee.getMessage());
+ }
+
+ MessageDialog.openInformation(getShell(),
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-09-10 16:39:00 UTC (rev 4150)
+++ trunk/eclipse/debian/rules 2007-09-11 06:38:21 UTC (rev 4151)
@@ -63,7 +63,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
@@ -131,6 +131,7 @@
eclipse-libupdatebuild \
eclipse-libupdatebuild2 \
eclipse-jsch \
+ eclipse-jsch-sftpexception \
eclipse-disable-junit4-apt \
eclipse-libswt-xpcomgcc4 \
eclipse-icu4j-build-files \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
