[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-75-gc0afec4
Benjamin Drung
bdrung-guest at alioth.debian.org
Tue Jun 29 23:45:36 UTC 2010
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-3.6 has been updated
via c0afec40c7169874ff944b32206f9f901c85d4de (commit)
via 7345adc5e570733f98090be81966bc64c029ab95 (commit)
via c7792c3d3a25f865cd32f090d4f9d18c5e6cdbd4 (commit)
via d3424c71940bc3ed1c6cdaed6a5431067630fa5c (commit)
via d07b6e58dd85e8e753aa79a7b9b0910f5e4df241 (commit)
via 88caf60c4d7c4f6f82e11813d73e5c34deec50f8 (commit)
via 4b365d230eeaee55dd5be83870aeecee4f288bf2 (commit)
via 2938e113b566cfb5c085cdc5cedb535602e05350 (commit)
via 71dabe2d92d6453451a1b27236589bedbdfec800 (commit)
via 745f7dc70f6b58ac4b3944d94aee9ba3abcded03 (commit)
via d1e34264cb75c8a468a15b813a4923190773c510 (commit)
via c6e6fc0eb547363764d2a7b5c4489785cdee4e1e (commit)
via 2d5142cf5198e39c51d95cf68a66191c55742a10 (commit)
via f897a52e35055481f4a5451f2ccf7f3d9f134d21 (commit)
via 512f1cf5c810b9fbb9bc0fea614f473df93bd1d0 (commit)
via 06d81dcd7e162b4ae135fb1fb03c7ff92f35c8a2 (commit)
via 20925a8c8170eb31a2dce637c475869e3f68583e (commit)
via 19a2922fc65002d73e766543228b524eef971c9f (commit)
via 53d4b243be42f81f14c8d137014974e6d3efd719 (commit)
via d333391ae5d4cd349230f6d9259c14270ff421fd (commit)
from 1bd1a7500261c52a3b10b3ae739f54d854dfb658 (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 c0afec40c7169874ff944b32206f9f901c85d4de
Merge: 1bd1a75 7345adc
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Jun 30 01:44:45 2010 +0200
Merge version 3.5.2-5 from branch 'master' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
build.xml | 6 ++--
debian/changelog | 36 +++++++++++++++++---
debian/control | 20 ++++++-----
debian/eclipse-platform-data.install | 2 +
debian/patches/add-o.e.equinox.concurrent.patch | 25 ++++++++++++++
debian/patches/build-arch.patch | 6 ++--
debian/patches/series | 1 +
debian/poms/pom-equinox-osgi.services.xml | 31 ++++++++++++++++++
debian/poms/pom-equinox-osgi.util.xml | 26 +++++++++++++++
debian/poms/pom-equinox-osgi.xml | 22 +++++++++++++
debian/rules | 21 +++++++++++-
eclipse/features/org.eclipse.platform/feature.xml | 8 +++++
12 files changed, 181 insertions(+), 23 deletions(-)
diff --git a/build.xml b/build.xml
index 8481590..3c6eeb4 100644
--- a/build.xml
+++ b/build.xml
@@ -58,13 +58,13 @@
<arg line="-m" />
</exec>
<condition property="hostArch" value="arm">
- <matches pattern="arm*" string="${uname-m}"/>
+ <matches pattern="^arm.*" string="${uname-m}"/>
</condition>
<condition property="hostArch" value="x86">
<matches pattern="i[0-9]*86" string="${uname-m}"/>
</condition>
<condition property="hostArch" value="PA_RISC">
- <matches pattern="parisc*" string="${uname-m}"/>
+ <matches pattern="^parisc.*" string="${uname-m}"/>
</condition>
<condition property="hostArch" value="sparc">
<matches pattern="sparcv9" string="${uname-m}"/>
@@ -75,7 +75,7 @@
<condition property="buildArch" value="${hostArch}">
<not><isset property="buildArch" /></not>
</condition>
- <echo message="Build on ${hostArch} for ${buildArch}."/>
+ <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
diff --git a/debian/changelog b/debian/changelog
index 5eb64d0..3c463e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,25 +4,49 @@ eclipse (3.6.0-1) UNRELEASED; urgency=low
-- Benjamin Drung <bdrung at ubuntu.com> Thu, 10 Jun 2010 20:51:11 +0200
-eclipse (3.5.2-3ubuntu1~ppa1~4.gbp4cf94f) UNRELEASED; urgency=low
+eclipse (3.5.2-5) unstable; urgency=medium
- ** SNAPSHOT build @4cf94fd7288243bb9e4ca7765b3744515683ee65 **
+ [ Benjamin Drung ]
+ * Fix pattern matching to detect correct architecture.
+
+ [ Niels Thykier ]
+ * Move operations on arch:all packages to its own make target. Fixes FTBFS on
+ all buildds.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Tue, 29 Jun 2010 22:00:44 +0200
+
+eclipse (3.5.2-4) unstable; urgency=low
[ Niels Thykier ]
* Added menu entry for the Debian menu.
* Moved a lot of arch-indep plugins into eclipse-platform-data.
- * Backported fix for poor tooltip colors with certain themes. (LP:
- #540332)
- * UNRELEASED
+ * Backported fix for poor tooltip colors with certain themes.
+ (Closes: #582302, LP: #540332)
* Backported fix for hover text visability problem.
* Corrected a format issue in debian/copyright.
* Removed depends on cvs for eclipse-plugin-cvs, it is not needed.
(LP: #592508)
+ * Removed Depends on JRE for libequinox-osgi-java.
+ * Added patch to use sat4j 2.2 instead of 2.1 (Closes: #586978)
+ * Added recommends on eclipse-pde for eclipse-platform.
+ (LP: #593260)
+ * Added patch to install the o.e.equinox.concurrent plugin in
+ eclipse-platform (Closes: #585178)
+ * Bumped (Build-)Depends on libhamcrest-java to 1.1-8 to avoid
+ being affected by a regression in libhamcrest-java 1.1-7.
[ Adnan Hodzic ]
* Added debian/patches/fix-bashism.patch (Closes: #581099)
- -- Niels Thykier <niels at thykier.net> Sat, 05 Jun 2010 16:56:57 +0200
+ [ Yulia Novozhilova ]
+ * Added the Maven POMs for libequinox-osgi.java (LP: #598039)
+ * Added a Build-Depends dependency on maven-repo-helper and maven-ant-helper
+ * Added missing recommends on libservlet2.5-java for libequinox-osgi-java.
+
+ [ Benjamin Drung ]
+ * Bump Standards-Version to 3.9.0 (no changes required).
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Mon, 28 Jun 2010 22:25:42 +0200
eclipse (3.5.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a171d72..e4c7707 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: ant (>= 1.7.1),
libgnome-vfsmm-2.6-dev,
libgnomeui-dev,
libgtk2.0-dev,
- libhamcrest-java (>= 1.1-8),
+ libhamcrest-java (>= 1.1-8~),
libicu4j-java (>= 4.0.1.1),
libjasper-java,
libjetty-java (>= 6.1.24),
@@ -36,12 +36,14 @@ Build-Depends: ant (>= 1.7.1),
libxt-dev,
libxtst-dev,
lsb-release,
+ maven-ant-helper,
+ maven-repo-helper,
pkg-config,
sat4j (>= 2.2),
unzip,
xulrunner-dev (>= 1.9.1.3-2),
zip
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
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
@@ -71,7 +73,7 @@ Depends: default-jre | java5-runtime | java6-runtime,
eclipse-plugin-cvs (= ${binary:Version}),
junit (>= 3.8.2-4),
junit4 (>= 4.7-3),
- libhamcrest-java (>= 1.1-8),
+ libhamcrest-java (>= 1.1-8~),
${misc:Depends}
Recommends: default-jdk | sun-java6-jdk
Suggests: eclipse
@@ -133,18 +135,18 @@ Depends: ant (>= 1.7.1),
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
+Recommends: eclipse-pde
Replaces: eclipse-jdt (<< 3.5.1+repack~3),
eclipse-platform-common,
eclipse-platform-gcj,
eclipse-source (<= 3.1.1-3),
libeclipse-jni
+Breaks: eclipse-source (<= 3.1.1-3)
Conflicts: eclipse-platform-common,
- eclipse-source (<= 3.1.1-3),
libeclipse-jni,
eclipse-platform-nls,
eclipse-common-nls
-Suggests: eclipse-jdt,
- eclipse-pde
+Suggests: eclipse-jdt
Description: Eclipse platform without plug-ins to develop any language
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -239,9 +241,9 @@ Description: Eclipse Rich Client Platform (RCP)
Package: libequinox-osgi-java
Architecture: all
Section: java
-Depends: default-jre | java5-runtime | java6-runtime,
- ${misc:Depends}
-Conflicts: eclipse-rcp (<< 3.5.1-0ubuntu3)
+Depends: ${misc:Depends}
+Recommends: libservlet2.5-java
+Breaks: eclipse-rcp (<< 3.5.1-0ubuntu3)
Replaces: eclipse-platform-gcj,
eclipse-rcp-gcj
Description: Equinox OSGi framework
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 3a4e426..3e9a184 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -40,6 +40,8 @@ usr/lib/eclipse/plugins/org.eclipse.ecf.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.ssl.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.ssl_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent.source_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_*.jar
usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.source_*.jar
diff --git a/debian/patches/add-o.e.equinox.concurrent.patch b/debian/patches/add-o.e.equinox.concurrent.patch
new file mode 100644
index 0000000..025af10
--- /dev/null
+++ b/debian/patches/add-o.e.equinox.concurrent.patch
@@ -0,0 +1,25 @@
+Description: Adds org.eclipse.equinox.concurrent as one of the plugins to be
+ installed.
+ .
+ This is a Debian specific patch.
+Author: Niels Thykier <niels at thykier.net>
+Bug-Debian: #585178
+Forwarded: not needed
+
+diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
+index a85e2dd..49fd699 100644
+--- a/eclipse/features/org.eclipse.platform/feature.xml
++++ b/eclipse/features/org.eclipse.platform/feature.xml
+@@ -620,4 +620,12 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="org.eclipse.equinox.concurrent"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
+ </feature>
diff --git a/debian/patches/build-arch.patch b/debian/patches/build-arch.patch
index 3b1e662..9cc0330 100644
--- a/debian/patches/build-arch.patch
+++ b/debian/patches/build-arch.patch
@@ -13,13 +13,13 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
+ <arg line="-m" />
+ </exec>
+ <condition property="hostArch" value="arm">
-+ <matches pattern="arm*" string="${uname-m}"/>
++ <matches pattern="^arm.*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="x86">
+ <matches pattern="i[0-9]*86" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="PA_RISC">
-+ <matches pattern="parisc*" string="${uname-m}"/>
++ <matches pattern="^parisc.*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="sparc">
+ <matches pattern="sparcv9" string="${uname-m}"/>
@@ -30,7 +30,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
+ <condition property="buildArch" value="${hostArch}">
+ <not><isset property="buildArch" /></not>
+ </condition>
-+ <echo message="Build on ${hostArch} for ${buildArch}."/>
++ <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
+
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
diff --git a/debian/patches/series b/debian/patches/series
index e6798dd..28d9127 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ build-arch.patch
update-dependency.patch
regenerateBootstrapFiles.patch
java-home.patch
+add-o.e.equinox.concurrent.patch
diff --git a/debian/poms/pom-equinox-osgi.services.xml b/debian/poms/pom-equinox-osgi.services.xml
new file mode 100644
index 0000000..35820e6
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.services.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>3.2.0</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://freemarker.org</url>
+ <scm>
+ <url>http://www.eclipse.org/projects/project_summary.php?projectid=rt.equinox</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+ </project>
\ No newline at end of file
diff --git a/debian/poms/pom-equinox-osgi.util.xml b/debian/poms/pom-equinox-osgi.util.xml
new file mode 100644
index 0000000..3732c95
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.util.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.util</artifactId>
+ <version>3.2.0</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://eclipse.org</url>
+ <scm>
+ <url>http://www.eclipse.org/projects/project_summary.php?projectid=rt.equinox</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ </dependency>
+ </dependencies>
+ </project>
diff --git a/debian/poms/pom-equinox-osgi.xml b/debian/poms/pom-equinox-osgi.xml
new file mode 100644
index 0000000..696aa72
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://eclipse.org</url>
+ <scm>
+ <url>http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.osgi/</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <!-- no required dependencies -->
+ </dependencies>
+ </project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a11c1c6..77b18fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
override_dh_auto_clean:
ant distclean
+ rm -fr debian/.mh/
override_dh_auto_install:
ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp
@@ -106,6 +107,8 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
endif
+POMS := debian/poms/pom-equinox-osgi.xml debian/poms/pom-equinox-osgi.services.xml debian/poms/pom-equinox-osgi.util.xml
+
override_dh_install:
# Turn all following commands into patches and send them to eclipse-build
# Remove some bad arguments that causes eclipse to fail
@@ -200,10 +203,17 @@ override_dh_install:
sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
chmod a+x $(PDEBUILD_INSTALL)
dh_install
- # mv arch-indep plugins from lib to share
- [ ! -d debian/eclipse-platform-data ] || (cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl)
+ # Fix some weird exec permission
+ chmod a-x debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README
$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar /usr/lib/eclipse/plugins)
+ # Check if we are doing a -B build
+ [ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install_indep
+
+# Operations on arch: all packages - not invoked if building with -B
+override_dh_install_indep:
+ # mv arch-indep plugins from lib to share
+ cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl
# Expose osgi jars
mkdir -p debian/libequinox-osgi-java/usr/share/java
cd debian/libequinox-osgi-java/usr/share/java && \
@@ -211,3 +221,10 @@ override_dh_install:
ln -s $$FILE ; \
ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
done
+ # Install poms and jars into Maven repo
+ for pom in $(POMS); do \
+ mh_installpom -v -plibequinox-osgi-java $$pom; \
+ SUFFIX=`basename $$pom .xml | sed 's/pom-equinox-//'`; \
+ mh_installjar -v -plibequinox-osgi-java $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \
+ done
+
diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
index 65e6d99..84e2d9f 100644
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
@@ -620,4 +620,12 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.equinox.concurrent"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
</feature>
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list