This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via d407653e4510275b3cea576c6160187e79e68e66 (commit)
via 08cd9b749422f392849e616172ccf8247efd91c7 (commit)
from d9819129d7f06d63c41376ca62a8635790ecac20 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d407653e4510275b3cea576c6160187e79e68e66
Merge: d9819129d7f06d63c41376ca62a8635790ecac20
08cd9b749422f392849e616172ccf8247efd91c7
Author: Benjamin Drung <[email protected]>
Date: Sat Oct 17 19:51:16 2009 +0200
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 ++
build.xml | 1 +
patches/eclipse-add-ppc64-sparc64-s390-s390x.patch | 61 ++++++++++++++++++++
3 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0adeec1..e8ce415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15 Alexander Kurtakov <[email protected]>
+
+ * patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: New file.
+ * build.xml: Add patch with constants for additional args.
+
2009-10-12 Alexander Kurtakov <[email protected]>
* build.xml: Create a symlink to o.e.equinox.launcher in the install.
(Niels Thykier)
diff --git a/build.xml b/build.xml
index 2dce87d..9fe198e 100644
--- a/build.xml
+++ b/build.xml
@@ -204,6 +204,7 @@
<patch
patchfile="${basedir}/patches/eclipse-buildswtnatives.patch"
dir="${buildDirectory}" strip="0" />
<patch
patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch"
dir="${buildDirectory}" strip="0" />
<patch
patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch"
dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
strip="3" />
+ <patch
patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch"
dir="${buildDirectory}" strip="1" />
<patch
patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch"
dir="${buildDirectory}" strip="3" />
<patch
patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch"
dir="${buildDirectory}" strip="3" />
<patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
diff --git a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
new file mode 100644
index 0000000..3a2c701
--- /dev/null
+++ b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
@@ -0,0 +1,61 @@
+diff -ru
eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
+---
eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
2007-06-25 15:57:02.000000000 -0400
++++
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
2007-07-16 16:08:02.000000000 -0400
+@@ -47,6 +47,11 @@
+ Platform.ARCH_X86, //
+ Platform.ARCH_AMD64, //
+ Platform.ARCH_IA64, //
++ Platform.ARCH_PPC64, //
++ Platform.ARCH_SPARC64, //
++ Platform.ARCH_S390, //
++ Platform.ARCH_S390X, //
++ Platform.ARCH_ALPHA, //
+ Platform.ARCH_IA64_32};
+
+ // debug support: set in loadOptions()
+Only in
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime:
InternalPlatform.java.orig
+diff -ru
eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
+---
eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
2007-06-25 15:57:18.000000000 -0400
++++
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
2007-07-16 16:08:02.000000000 -0400
+@@ -346,6 +346,12 @@
+ * @since 3.1
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
++
++ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
++ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
++ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
++ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
+
+ /**
+ * Constant string (value "win32") indicating the platform is running
on a
+Only in
eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime:
Platform.java.orig
+diff -ru
eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
+---
eclipse-3.3-src.orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
2007-06-25 15:57:06.000000000 -0400
++++
eclipse-3.3-src/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
2007-07-16 16:08:02.000000000 -0400
+@@ -64,7 +64,7 @@
+ private static final String MANIFEST_VERSION = "Manifest-Version";
//$NON-NLS-1$
+ private static final String PLUGIN_PROPERTIES_FILENAME = "plugin";
//$NON-NLS-1$
+ private static PluginConverterImpl instance;
+- private static final String[] ARCH_LIST =
{org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC,
org.eclipse.osgi.service.environment.Constants.ARCH_PPC,
org.eclipse.osgi.service.environment.Constants.ARCH_SPARC,
org.eclipse.osgi.service.environment.Constants.ARCH_X86,
org.eclipse.osgi.service.environment.Constants.ARCH_AMD64,
org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
++ private static final String[] ARCH_LIST =
{org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC,
org.eclipse.osgi.service.environment.Constants.ARCH_PPC,
org.eclipse.osgi.service.environment.Constants.ARCH_SPARC,
org.eclipse.osgi.service.environment.Constants.ARCH_X86,
org.eclipse.osgi.service.environment.Constants.ARCH_AMD64,
org.eclipse.osgi.service.environment.Constants.ARCH_IA64,
org.eclipse.osgi.service.environment.Constants.ARCH_PPC64,
org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64,
org.eclipse.osgi.service.environment.Constants.ARCH_S390,
org.eclipse.osgi.service.environment.Constants.ARCH_S390X,
org.eclipse.osgi.service.environment.Constants.ARCH_ALPHA};
+ static public final String FRAGMENT_MANIFEST = "fragment.xml";
//$NON-NLS-1$
+ static public final String GENERATED_FROM = "Generated-from";
//$NON-NLS-1$
+ static public final String MANIFEST_TYPE_ATTRIBUTE = "type";
//$NON-NLS-1$
+diff -ru
eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+---
eclipse-3.4-src.orig/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig
2008-07-22 08:37:14.000000000 -0400
++++
eclipse-3.4-src/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
2008-07-22 08:38:02.000000000 -0400
+@@ -131,6 +131,12 @@
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+
++ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
++ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
++ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
++ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
++
+ /**
+ * Constant string (value "win32") indicating the platform is running
on a
+ * machine using the Windows windowing system.
diff --git a/pdebuild/eclipse-copy-platform.sh
b/pdebuild/eclipse-copy-platform.sh
old mode 100755
new mode 100644
diff --git a/runtests.sh b/runtests.sh
old mode 100755
new mode 100644
diff --git a/swt_bundle.sh b/swt_bundle.sh
old mode 100755
new mode 100644
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
