[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. d30292b6906a8e982b00dae8f509cd830db05227

Fri Feb 26 16:37:43 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, 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  <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 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  <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 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.

