[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch: commit 4ff24561981a00f8df0cbe9f7943da502df97471 Merge: 416baed96dee7a3d67c61de7b73386455273e9d0 e12f839661493dd8507a2e7a4e9f634372bed175 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sat Mar 10 19:38:59 2012 +0100 Merge tag 'upstream/3.7.2' into master Upstream version 3.7.2 -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch:
commit b8a94293ef45f9a82f21625301e63d14d62b0c80
Author: Jakub Adam jakub.a...@ktknet.cz
Date: Wed Mar 7 01:04:53 2012 +0100
Refreshed patches
diff --git a/debian/patches/relabel-to-3-7-1.patch
b/debian/patches/relabel-to-3-7-2.patch
similarity index 85%
rename from debian/patches/relabel-to-3-7-1.patch
rename to debian/patches/relabel-to-3-7-2.patch
index 38f8b92..eb55d13 100644
--- a/debian/patches/relabel-to-3-7-1.patch
+++ b/debian/patches/relabel-to-3-7-2.patch
@@ -1,8 +1,8 @@
From: Jakub Adam jakub.a...@ktknet.cz
-Date: Wed, 28 Dec 2011 14:48:52 +0100
-Subject: relabel-to-3-7-1
+Date: Wed, 7 Mar 2012 01:02:44 +0100
+Subject: relabel-to-3-7-2
-change label to 3.7.1
+change label to 3.7.2
---
build.properties|4 ++--
buildSDKSource.sh |2 +-
@@ -11,7 +11,7 @@ change label to 3.7.1
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.properties b/build.properties
-index f83057f..5827924 100644
+index f83057f..46d01ef 100644
--- a/build.properties
+++ b/build.properties
@@ -2,8 +2,8 @@
@@ -20,13 +20,13 @@ index f83057f..5827924 100644
buildTag=I20110613-1736
-label=3.7.0
-testsBuildLabel=3.7.0
-+label=3.7.1
-+testsBuildLabel=3.7.1
++label=3.7.2
++testsBuildLabel=3.7.2
testframework=org.eclipse.test_3.3.100
p2.director.version=${testsBuildLabel}
testsBuildId=v20100211
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
-index 6668c6e..4d40052 100755
+index 6668c6e..dcce17a 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -9,7 +9,7 @@ eclipseBuilder=
@@ -34,12 +34,12 @@ index 6668c6e..4d40052 100755
baseBuilderTag=R3_7
eclipseBuilderTag=R3_7
-label=3.7.0
-+label=3.7.1
++label=3.7.2
fetchTests=yes
usage=usage: build ID [-workdir working directory] [-baseBuilder path
to org.eclipse.releng.basebuilder checkout] [-eclipseBuilder path to
org.eclipse.releng.eclipsebuilder checkout] [-baseBuilderTag
org.eclipse.releng.basebuilder tag to check out] [-noTests]
diff --git a/pdebuild.properties b/pdebuild.properties
-index 8c34c70..5d4d862 100644
+index 8c34c70..daf92f7 100644
--- a/pdebuild.properties
+++ b/pdebuild.properties
@@ -2,9 +2,9 @@ buildArch=x86
@@ -49,14 +49,14 @@ index 8c34c70..5d4d862 100644
-buildId=3.7.0
-buildTag=3.7.0
-label=3.7.0
-+buildId=3.7.1
-+buildTag=3.7.1
-+label=3.7.1
++buildId=3.7.2
++buildTag=3.7.2
++label=3.7.2
bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
-index d8b182e..85a05c0 100755
+index d8b182e..4eb53ed 100755
--- a/regenerateBootstrapFiles.sh
+++ b/regenerateBootstrapFiles.sh
@@ -18,5 +18,5 @@ $launcherDir/plugins/org.eclipse.equinox.launcher_*.jar \
@@ -64,6 +64,5 @@ index d8b182e..85a05c0 100755
-f pdebuild.xml generateScripts \
-DskipBase=true \
--DsdkSource=build/eclipse-3.7.0-src \
-+-DsdkSource=build/eclipse-3.7.1-src \
++-DsdkSource=build/eclipse-3.7.2-src \
21 | tee ./generatePdeBuildScripts.log
---
diff --git a/debian/patches/series b/debian/patches/series
index 25d7ef4..bff28be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,8 +16,8 @@ gnomeproxy-makefile.patch
find-newer-servlet-api.patch
eclipse-build-additionalArchs.patch
remove-org-apache-lucene.patch
-relabel-to-3-7-1.patch
fix-com-ibm-icu-search-path.patch
set-shared-config-dir.patch
use-distribution-swt.patch
add-o.e.equinox.log.patch
+relabel-to-3-7-2.patch
--
eclipse - Powerful IDE written in java - Debian package.
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch: commit eead04eac4182edf0be47c509171d34d3625e902 Author: Jakub Adam jakub.a...@ktknet.cz Date: Wed Mar 7 01:08:47 2012 +0100 Updated changelog diff --git a/debian/changelog b/debian/changelog index 7d217f7..3f971b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -eclipse (3.7.1-2) UNRELEASED; urgency=low +eclipse (3.7.2-1) UNRELEASED; urgency=low + * New upstream release. * Use SWT from swt-gtk package instead of the bundled version (Closes: #538808). * Add org.eclipse.equinox.log to eclipse-rcp. * Make extended description of eclipse binary package more accurate (Closes: #655945). - -- Jakub Adam jakub.a...@ktknet.cz Sat, 14 Jan 2012 19:32:00 +0100 + -- Jakub Adam jakub.a...@ktknet.cz Wed, 07 Mar 2012 01:07:05 +0100 eclipse (3.7.1-1) unstable; urgency=low -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch: commit c48c8275b4c2ef7cfa55e3780dd74d2c66040e86 Author: Jakub Adam jakub.a...@ktknet.cz Date: Wed Mar 7 20:17:57 2012 +0100 Updated d/eclipse-build-generatedScripts.tar.bz2 diff --git a/debian/eclipse-build-generatedScripts.tar.bz2 b/debian/eclipse-build-generatedScripts.tar.bz2 index 3f1058c..7b73e4f 100644 Binary files a/debian/eclipse-build-generatedScripts.tar.bz2 and b/debian/eclipse-build-generatedScripts.tar.bz2 differ -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch:
commit b1c1e7a95e348b0d8a23fc536954cbf3e6f3d257
Author: Jakub Adam jakub.a...@ktknet.cz
Date: Fri Mar 9 19:19:17 2012 +0100
Updated icu4j dependency
diff --git a/debian/control b/debian/control
index 18647e1..d966b68 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: ant (= 1.8.2),
libgnomeui-dev,
libgtk2.0-dev,
libhamcrest-java (= 1.1-8~),
- libicu4j-4.4-java (= 4.4.2),
+ libicu4j-4.4-java (= 4.4.2.2),
libjasper-java (= 5.5.33-2),
libjetty-java (= 6.1.24-4~),
libjsch-java (= 0.1.37-3),
@@ -196,7 +196,7 @@ Package: eclipse-rcp
Architecture: any
Depends: default-jre | java5-runtime | java6-runtime,
libequinox-osgi-java (= ${source:Version}),
- libicu4j-4.4-java (= 4.4.2),
+ libicu4j-4.4-java (= 4.4.2.2),
libswt-gtk-3-java (= 3.7.1-2),
libswt-cairo-gtk-3-jni,
libswt-webkit-gtk-3-jni,
--
eclipse - Powerful IDE written in java - Debian package.
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch: commit c4bd7f9c586e06f2c04c9aa74aad81c5c8640f28 Author: Jakub Adam jakub.a...@ktknet.cz Date: Thu Mar 8 17:49:40 2012 +0100 Revert Remove org.eclipse.swt from bundles.info so that its upgrade does not break Eclipse This reverts commit 416baed96dee7a3d67c61de7b73386455273e9d0. This doesn't work, some other way how to deal with core bundle's orbit depencency upgrades must be developed. diff --git a/debian/rules b/debian/rules index f4ced1e..6957cc3 100755 --- a/debian/rules +++ b/debian/rules @@ -49,8 +49,6 @@ override_dh_install: echo 'osgi.bundlefile.limit=100' debian/tmp/usr/lib/eclipse/configuration/config.ini # Remove the unnecessary configuration data (taken from Fedora spec) find debian/tmp/usr/lib/eclipse -depth -type d -empty -delete - # Remove org.eclipse.swt from bundles.info so that its upgrade does not break Eclipse - sed -i /org.eclipse.swt/d debian/tmp/usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info # fix permissions of scripts ### FIXME - update to the new dropins layout (steal from fedora-spec file) chmod +x debian/tmp/usr/lib/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch: commit 7fbc0bb697ce97703ae325981ca4be5a2de9b09e Author: Jakub Adam jakub.a...@ktknet.cz Date: Sat Mar 10 21:50:01 2012 +0100 Bump Standards-Version to 3.9.3 (no changes required) diff --git a/debian/changelog b/debian/changelog index 3f971b3..fc9c47b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ eclipse (3.7.2-1) UNRELEASED; urgency=low * New upstream release. - * Use SWT from swt-gtk package instead of the bundled version (Closes: #538808). + * Use SWT from swt-gtk package instead of the bundled version +(Closes: #538808). * Add org.eclipse.equinox.log to eclipse-rcp. * Make extended description of eclipse binary package more accurate (Closes: #655945). + * Bump Standards-Version to 3.9.3 (no changes required). -- Jakub Adam jakub.a...@ktknet.cz Wed, 07 Mar 2012 01:07:05 +0100 diff --git a/debian/control b/debian/control index d966b68..c77e2a4 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Build-Depends: ant (= 1.8.2), unzip, zip Build-Conflicts: xulrunner-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse.git -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55
The following commit has been merged in the master branch:
commit f2a1b556fb8c568f7cee19464d577a810e0cbc9e
Author: Jakub Adam jakub.a...@ktknet.cz
Date: Sat Mar 10 23:14:59 2012 +0100
Add bundle-info-helper.patch and find-org-apache-ant.patch
diff --git a/debian/changelog b/debian/changelog
index fc9c47b..b077489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ eclipse (3.7.2-1) UNRELEASED; urgency=low
* Make extended description of eclipse binary package more accurate
(Closes: #655945).
* Bump Standards-Version to 3.9.3 (no changes required).
+ * Fix broken installaton after some package Eclipse core platform
+depends on is upgraded (Closes: #662153, #663335).
-- Jakub Adam jakub.a...@ktknet.cz Wed, 07 Mar 2012 01:07:05 +0100
diff --git a/debian/patches/bundle-info-helper.patch
b/debian/patches/bundle-info-helper.patch
new file mode 100644
index 000..c817c6c
--- /dev/null
+++ b/debian/patches/bundle-info-helper.patch
@@ -0,0 +1,318 @@
+From: Jakub Adam jakub.a...@ktknet.cz
+Date: Sat, 10 Mar 2012 18:06:03 +0100
+Subject: bundle-info-helper
+
+In bundles.info there is a list of bundles load by Equinox simple configurator
+on startup. This file is generated when Eclipse is built from sources and its
+contents are fixed thereafter. This patch tries to solve a situation when some
+of orbit dependencies are upgraded by operating system's package manager.
+
+The bundle's record in bundles.info contains a version number it had at the
+time of compilation. When this number becomes different from the version of
+bundle that is actually installed in the system, Eclipse rejects to load the
+bundle which leads to missing plugins or even inability to start the workbench.
+
+When bundles.info is loaded by simpleconfigurator, the BundleInfoHelper class
+inspects OSGi metadata of the installed bundles and replaces the version
+number from bundles.info with the real one. It does this only to the runtime
+data structures, bundles file is kept read only. After that, simpleconfigurator
+is able to load the upgraded bundles.
+---
+ .../src/org/debian/BundleInfoHelper.java | 261
+ .../utils/SimpleConfiguratorUtils.java |8 +-
+ 2 files changed, 268 insertions(+), 1 deletions(-)
+ create mode 100644
eclipse/plugins/org.eclipse.equinox.simpleconfigurator/src/org/debian/BundleInfoHelper.java
+
+diff --git
a/eclipse/plugins/org.eclipse.equinox.simpleconfigurator/src/org/debian/BundleInfoHelper.java
b/eclipse/plugins/org.eclipse.equinox.simpleconfigurator/src/org/debian/BundleInfoHelper.java
+new file mode 100644
+index 000..0888047
+--- /dev/null
b/eclipse/plugins/org.eclipse.equinox.simpleconfigurator/src/org/debian/BundleInfoHelper.java
+@@ -0,0 +1,261 @@
++/***
++ * Copyright (c) 2012 Jakub Adam.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ *
++ * The code is based on getOSGiManifest() method from
++ * org.eclipse.equinox.internal.frameworkadmin.utils.Utils and
++ * org.eclipse.osgi.util.ManifestElement classes. The original code copyright
++ * holder is IBM Corporation.
++
***/
++
++package org.debian;
++
++import java.io.*;
++import java.net.*;
++import java.util.*;
++import java.util.jar.JarFile;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipFile;
++import org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo;
++import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil;
++import org.osgi.framework.Constants;
++import org.osgi.framework.Version;
++
++/**
++ * In bundles.info there is a list of bundles load by Equinox simple
configurator
++ * on startup. This file is generated when Eclipse is built from sources and
its
++ * contents are fixed thereafter. This class tries to solve a situation when
some
++ * of orbit dependencies are upgraded by operating system's package manager.
++ *
++ * The bundle's record in bundles.info contains a version number it had at the
++ * time of compilation. When this number becomes different from the version of
++ * that is actually installed in the system, Eclipse rejects to load the
bundle
++ * which leads to missing plugins or even inability to start the workbench.
++ *
++ * When bundles.info is loaded by simpleconfigurator, the BundleInfoHelper
class
++ * inspects OSGi metadata of the installed bundles and replaces the version
++ * number from bundles.info with the real one. It does this only to the
runtime
++ * data structures, bundles file is kept read only. After that,
simpleconfigurator
++ * can load the upgraded bundles.
++ */
++public class BundleInfoHelper {
++
++
