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, upstream has been updated
via d30292b6906a8e982b00dae8f509cd830db05227 (commit)
via 4b0aecc102a034b2c15644a648219f59570054b0 (commit)
from 9cd5c63d4c364f7e10cb723255e49ef9e9994f9f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++++
build.xml | 1 +
eclipse-build-feature/ChangeLog | 4 +
eclipse-build-feature/feature.xml | 6 --
.../eclipse-nosourcebundlesfordependencies.patch | 62 ++++++++++++++++++++
pdebuild/eclipse-pdebuild.sh | 2 +-
6 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2a7809f..4b97f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-02-26 Andrew Overholt <[email protected]>
+ * patches/eclipse-nosourcebundlesfordependencies.patch: Remove
references
+ to dependency source bundles.
+ * build.xml: Apply above patch.
+
+2010-02-26 Andrew Overholt <[email protected]>
+
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 <[email protected]>
* 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 <[email protected]>
+
+ * pdebuild/eclipse-pdebuild.sh: Add exit 1 on unknown option.
+
2010-02-24 Andrew Overholt <[email protected]>
*
dependencyManifests/com.ibm.icu_4.0.1.v20090822.jar/META-INF/MANIFEST.MF: New
file.
diff --git a/build.xml b/build.xml
index 3906548..a3a9b8b 100644
--- a/build.xml
+++ b/build.xml
@@ -253,6 +253,7 @@
<patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
<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/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 <[email protected]>
+
+ * feature.xml: Remove dependency on icu4j source bundle.
+
2010-02-25 Andrew Overholt <[email protected]>
* 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
+
[email protected]=org.eclipse.rcp,[email protected];version=4.0.1.qualifier;unpack="false"
[email protected]=org.eclipse.rcp
+
[email protected]=org.eclipse.equinox.p2.user.ui,\
+
[email protected];version=3.0.0.qualifier;unpack="false",\
+
[email protected];version=1.0.0.qualifier;unpack="false",\
+@@ -25,8 +25,6 @@ [email protected].
+
[email protected];version=1.0.0.qualifier;unpack="false",\
+
[email protected];version=3.0.0.qualifier;unpack="false",\
+
plu...@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+-
[email protected];version=1.3.0.qualifier;unpack="false,\
+-
[email protected];version=3.1.0.qualifier;unpack="false"
+
+
+
+@@ -35,4 +33,4 @@ [email protected].
+
+
+
+-
+\ 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
+
+
[email protected]=org.eclipse.platform,[email protected],[email protected];optional="true",[email protected];unpack="false",\
+- [email protected];version=1.7.1.qualifier;unpack="false",\
+- [email protected];version=0.1.41.qualifier;unpack="false",\
+ [email protected]
+
+ [email protected]=org.eclipse.jdt,
[email protected];unpack="false",\
[email protected];version=3.8.2.qualifier;unpack="false",\
[email protected];version=1.1.0.qualifier;unpack="false",\
+ [email protected]
[email protected]=org.eclipse.pde,[email protected];version=3.1.0.qualifier;unpack="false",\[email protected]
[email protected]=org.eclipse.pde,[email protected]
+ [email protected]=org.eclipse.pde.p2
+ [email protected]=org.eclipse.cvs
[email protected]=org.eclipse.help,\
+- [email protected];version=2.5.0.qualifier;unpack="false",\
+- [email protected];version=2.0.0.qualifier;unpack="false",\
+- [email protected];version=5.5.17.qualifier;unpack="false",\
+- [email protected];version=1.0.0.qualifier;unpack="false",\
+-
[email protected];version=1.0.4.qualifier;unpack="false",\
+- [email protected];version=1.9.1.qualifier;unpack="false",\
+-
[email protected];version=1.9.1.qualifier;unpack="false",\
+-
[email protected];version=6.1.15.qualifier;unpack="false",\
+-
[email protected];version=6.1.15.qualifier;unpack="false"
[email protected]=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 85cbd51..71cc3be 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.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
