[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. fa87ec200a685740519ede7d3c388350800c2088
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Feb 26 16:37:31 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 has been updated
via fa87ec200a685740519ede7d3c388350800c2088 (commit)
via 4e567228d3a23e6bb5bc2f8aa9419398d449be0e (commit)
via d30292b6906a8e982b00dae8f509cd830db05227 (commit)
via f9a640f587a9d579b88971744eb60f89e0244b5f (commit)
via a6cd797dc9f1f7808265dbf404d52ff2cef60af6 (commit)
via f26a490561f8e52bf3083a193f1358402b492d7f (commit)
via 5880fe62a0ecc35425dfb58f9fd09fddba058fac (commit)
via abb09122fcea857e9dd372e5a7c38207969ad1b2 (commit)
via 4b0aecc102a034b2c15644a648219f59570054b0 (commit)
from f0106c8aa36c11e8857d70992a1ce8e13628f6b0 (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 fa87ec200a685740519ede7d3c388350800c2088
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:37:21 2010 +0100
Refresh patches.
commit 4e567228d3a23e6bb5bc2f8aa9419398d449be0e
Merge: f9a640f587a9d579b88971744eb60f89e0244b5f d30292b6906a8e982b00dae8f509cd830db05227
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:35:31 2010 +0100
Merge branch 'upstream'
commit f9a640f587a9d579b88971744eb60f89e0244b5f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:32:55 2010 +0100
Add missing ecf source jar files to eclipse-platform.
commit a6cd797dc9f1f7808265dbf404d52ff2cef60af6
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:31:02 2010 +0100
Install plugins/org.junit4/junit.jar to eclipse-jdt.
commit f26a490561f8e52bf3083a193f1358402b492d7f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:27:28 2010 +0100
Update debian/NEWS.
commit 5880fe62a0ecc35425dfb58f9fd09fddba058fac
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 17:26:12 2010 +0100
Drop unused install-icu4j-bundles.patch.
commit abb09122fcea857e9dd372e5a7c38207969ad1b2
Merge: f0106c8aa36c11e8857d70992a1ce8e13628f6b0 4b0aecc102a034b2c15644a648219f59570054b0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 16:05:54 2010 +0100
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++++
build.xml | 1 +
debian/NEWS | 3 +-
debian/eclipse-jdt.install | 1 +
debian/eclipse-platform.install | 2 +
debian/patches/eclipse-manpage.patch | 8 +-
debian/patches/fix-shell-script-perm.patch | 6 +-
debian/patches/install-icu4j-bundles.patch | 21 -------
eclipse-build-feature/ChangeLog | 4 +
eclipse-build-feature/feature.xml | 6 --
.../eclipse-nosourcebundlesfordependencies.patch | 62 ++++++++++++++++++++
pdebuild/eclipse-pdebuild.sh | 2 +-
12 files changed, 91 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2a7809f..4b97f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-02-26 Andrew Overholt <overholt at redhat.com>
+ * patches/eclipse-nosourcebundlesfordependencies.patch: Remove references
+ to dependency source bundles.
+ * build.xml: Apply above patch.
+
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
Bug #280688
* dependencies.properties: Add Debian/Ubuntu locations (Benjamin Drung).
@@ -24,6 +30,7 @@
* build.xml: Add debuginfo to ant task .class files.
+
2010-02-25 Andrew Overholt <overholt at redhat.com>
* build.xml: Only build symlink task and symlink deps once (stamp file).
@@ -40,6 +47,10 @@
* buildSDKSource.sh: Delete more unused files (Benjamin Drung).
+2010-02-25 Alexander Kurtakov <akurtako at redhat.com>
+
+ * pdebuild/eclipse-pdebuild.sh: Add exit 1 on unknown option.
+
2010-02-24 Andrew Overholt <overholt at redhat.com>
* dependencyManifests/com.ibm.icu_4.0.1.v20090822.jar/META-INF/MANIFEST.MF: New file.
diff --git a/build.xml b/build.xml
index ad1918c..643d8db 100644
--- a/build.xml
+++ b/build.xml
@@ -254,6 +254,7 @@
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
diff --git a/debian/NEWS b/debian/NEWS
index 1de3e75..a03f630 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-eclipse (3.5.2-1) UNRELEASED; urgency=low
+eclipse (3.5.2-1) unstable; urgency=low
In previous versions of eclipse (<< 3.5), it would extract shared
libraries to users ~/.eclipse. This has been fixed in the 3.5
@@ -12,3 +12,4 @@ eclipse (3.5.2-1) UNRELEASED; urgency=low
now obsolete and will be silently ignored.
-- Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org> Thu, 25 Feb 2010 08:36:03 +0100
+
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index e45da83..5990d8f 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -36,5 +36,6 @@ usr/lib/eclipse/plugins/org.hamcrest.core.source_*.jar
usr/lib/eclipse/plugins/org.hamcrest.core_*.jar
usr/lib/eclipse/plugins/org.junit.source_*.jar
usr/lib/eclipse/plugins/org.junit4.source_*.jar
+usr/lib/eclipse/plugins/org.junit4/junit.jar
usr/lib/eclipse/plugins/org.junit4_*
usr/lib/eclipse/plugins/org.junit_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 2596c15..39ddf09 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -72,9 +72,11 @@ usr/lib/eclipse/plugins/org.eclipse.ecf.filetransfer.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.identity.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.identity_*.jar
+usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
+usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*.jar
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 47331c6..e8171fc 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -6,7 +6,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
Index: debian.git/eclipse.1.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/eclipse.1.xml 2010-02-26 15:15:45.845671484 +0100
++++ debian.git/eclipse.1.xml 2010-02-26 17:36:57.034422215 +0100
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -626,9 +626,9 @@ Index: debian.git/eclipse.1.xml
+</refentry>
Index: debian.git/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-26 15:15:37.195671648 +0100
-+++ debian.git/build.xml 2010-02-26 15:15:45.845671484 +0100
-@@ -796,6 +796,12 @@
+--- debian.git.orig/build.xml 2010-02-26 17:36:47.164421642 +0100
++++ debian.git/build.xml 2010-02-26 17:36:57.034422215 +0100
+@@ -797,6 +797,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
index 10dba9e..bfbc2f5 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -5,8 +5,8 @@ Applied-Upstream: no
Index: debian.git/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-26 15:15:25.655671490 +0100
-+++ debian.git/build.xml 2010-02-26 15:15:37.195671648 +0100
+--- debian.git.orig/build.xml 2010-02-26 17:36:44.005671264 +0100
++++ debian.git/build.xml 2010-02-26 17:36:47.164421642 +0100
@@ -251,6 +251,7 @@
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
@@ -14,4 +14,4 @@ Index: debian.git/build.xml
+ <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/install-icu4j-bundles.patch b/debian/patches/install-icu4j-bundles.patch
deleted file mode 100644
index 17ec5af..0000000
--- a/debian/patches/install-icu4j-bundles.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Installs com.ibm.icu.base, which would otherwise be left behind.
-Author: Niels Thykier <niels at thykier.net>
-Forwarded: no
-
-Index: debian.git/build.xml
-===================================================================
---- debian.git.orig/build.xml 2010-02-24 16:33:38.605339066 +0100
-+++ debian.git/build.xml 2010-02-24 16:33:50.824089013 +0100
-@@ -550,6 +550,12 @@
- <include name="org.eclipse.equinox.initializer*.jar" />
- </fileset>
- </copy>
-+ <copy todir="${buildDirectory}/installation/plugins">
-+ <!-- Apparently something forgets these. -->
-+ <fileset dir="${buildDirectory}/plugins/">
-+ <include name="com.ibm.icu.base*.jar" />
-+ </fileset>
-+ </copy>
- <echo file="provision.sdk-stamp" />
- </target>
-
diff --git a/eclipse-build-feature/ChangeLog b/eclipse-build-feature/ChangeLog
index 3f40530..9821ba3 100644
--- a/eclipse-build-feature/ChangeLog
+++ b/eclipse-build-feature/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
+ * feature.xml: Remove dependency on icu4j source bundle.
+
2010-02-25 Andrew Overholt <overholt at redhat.com>
* feature.xml: Remove dependency on com.ibm.icu.base.
diff --git a/eclipse-build-feature/feature.xml b/eclipse-build-feature/feature.xml
index 99488bd..bca9710 100755
--- a/eclipse-build-feature/feature.xml
+++ b/eclipse-build-feature/feature.xml
@@ -22,12 +22,6 @@
version="0.0.0"/>
<plugin
- id="com.ibm.icu.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.equinox.initializer"
download-size="0"
install-size="0"
diff --git a/patches/eclipse-nosourcebundlesfordependencies.patch b/patches/eclipse-nosourcebundlesfordependencies.patch
new file mode 100644
index 0000000..9510e63
--- /dev/null
+++ b/patches/eclipse-nosourcebundlesfordependencies.patch
@@ -0,0 +1,62 @@
+diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nodepsourcebundles ./features/org.eclipse.platform/sourceTemplateFeature/build.properties
+--- ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nodepsourcebundles 2010-02-26 10:43:44.777974439 -0500
++++ ./features/org.eclipse.platform/sourceTemplateFeature/build.properties 2010-02-26 10:45:40.561701587 -0500
+@@ -15,7 +15,7 @@ feature.xml,\
+ feature.properties,\
+ license.html
+
+-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.0.1.qualifier;unpack="false"
++generate.feature at org.eclipse.rcp.source=org.eclipse.rcp
+ generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
+ plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.ssl.source;version=1.0.0.qualifier;unpack="false",\
+@@ -25,8 +25,6 @@ generate.feature at org.eclipse.equinox.p2.
+ plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=3.0.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
+- plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
+
+
+
+@@ -35,4 +33,4 @@ generate.feature at org.eclipse.equinox.p2.
+
+
+
+-
+\ No newline at end of file
++
+diff -up ./features/org.eclipse.sdk/build.properties.nodepsourcebundles ./features/org.eclipse.sdk/build.properties
+--- ./features/org.eclipse.sdk/build.properties.nodepsourcebundles 2010-02-26 10:43:53.435706672 -0500
++++ ./features/org.eclipse.sdk/build.properties 2010-02-26 10:47:14.500699386 -0500
+@@ -11,26 +11,13 @@
+ bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
+
+ generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
+- plugin at org.apache.ant.source;version=1.7.1.qualifier;unpack="false",\
+- plugin at com.jcraft.jsch.source;version=0.1.41.qualifier;unpack="false",\
+ exclude at org.eclipse.platform.doc.user
+
+ generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
+-plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
+-plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
+ exclude at org.eclipse.jdt.doc.user
+-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.1.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
++generate.feature at org.eclipse.pde.source=org.eclipse.pde,exclude at org.eclipse.pde.doc.user
+ generate.feature at org.eclipse.pde.p2.source=org.eclipse.pde.p2
+ generate.feature at org.eclipse.cvs.source=org.eclipse.cvs
+-generate.feature at org.eclipse.help.source=org.eclipse.help,\
+- plugin at javax.servlet.source;version=2.5.0.qualifier;unpack="false",\
+- plugin at javax.servlet.jsp.source;version=2.0.0.qualifier;unpack="false",\
+- plugin at org.apache.jasper.source;version=5.5.17.qualifier;unpack="false",\
+- plugin at org.apache.commons.el.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
+- plugin at org.apache.lucene.source;version=1.9.1.qualifier;unpack="false",\
+- plugin at org.apache.lucene.analysis.source;version=1.9.1.qualifier;unpack="false",\
+- plugin at org.mortbay.jetty.util.source;version=6.1.15.qualifier;unpack="false",\
+- plugin at org.mortbay.jetty.server.source;version=6.1.15.qualifier;unpack="false"
++generate.feature at org.eclipse.help.source=org.eclipse.help
+
+-generatedVersionLength=45
+\ No newline at end of file
++generatedVersionLength=45
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index 56d23f9..bf9f039 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -178,7 +178,7 @@ do
;;
?)
usage
- exit
+ exit 1
;;
esac
done
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list