[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 536651fe50b90cc0c5e7da69a08f5a027be22b87

[Benjamin Drung]

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  536651fe50b90cc0c5e7da69a08f5a027be22b87 (commit)
      from  8fc5cdaf7f1d5f6aac74d812e1e571a677e0e5db (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 536651fe50b90cc0c5e7da69a08f5a027be22b87
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Sep 20 01:14:49 2009 +0200

    add stamp files to the remaining targets

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/stamp-fix.patch |   43 +++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/debian/patches/stamp-fix.patch b/debian/patches/stamp-fix.patch
index 4650ae8..d27156e 100644
--- a/debian/patches/stamp-fix.patch
+++ b/debian/patches/stamp-fix.patch
@@ -1,15 +1,48 @@
 diff -Nur -x '*.orig' -x '*~' debian.git/build.xml debian.git.new/build.xml
---- build.xml	2009-09-19 23:01:47.458065731 +0200
-+++ build.xml	2009-09-19 23:05:36.610065860 +0200
-@@ -12,6 +12,7 @@
+--- build.xml	2009-09-20 00:17:55.169565525 +0200
++++ build.xml	2009-09-20 00:24:40.642066046 +0200
+@@ -11,7 +11,10 @@
+ 	<!-- Check what has already been done -->
  	<uptodate property="unpack.complete" srcfile="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" targetfile="unpack-stamp" />
  	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
++	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
  	<uptodate property="build.complete" srcfile="unpack-stamp" targetfile="build-stamp" />
++	<uptodate property="p2prep.complete" srcfile="build-stamp" targetfile="p2prep-stamp" />
 +	<uptodate property="provision.sdk.complete" srcfile="build-stamp" targetfile="provision.sdk-stamp" />
  	<available file="bootstrap/plugins" property="bootstrapped" value="true" />
  
  	<property name="topBuildDir" value="${basedir}/build"/>
-@@ -331,7 +332,7 @@
+@@ -149,7 +152,7 @@
+ 		<echo file="build-stamp" />
+ 	</target>
+ 
+-	<target name="compilelibs" >
++	<target name="compilelibs" unless="compilelibs.complete">
+ 		<!-- TODO: Reenable when libgnomeproxy build is fixed.
+ 		<delete verbose="true">
+ 			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
+@@ -191,9 +194,10 @@
+ 		<!-- build libupdate -->
+ 		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+ 
++		<echo file="compilelibs-stamp" />
+ 	</target>
+ 
+-	<target name="p2prep" depends="build">
++	<target name="p2prep" depends="build" unless="p2prep.complete">
+ 		<!--<property name="builtZip" value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildId}-group.group.group.zip" />-->
+ 		<!-- archiveName is set in the build config's customTargets.xml -->
+ 		<!-- FIXME buildLabel should be used here but it's not defined so we cheat and use I.${buildId} instead. -->
+@@ -218,6 +222,8 @@
+ 		<copy file="${reposource}/content.jar" tofile="${reposource}/content.jar.afterrcpConfig" failonerror="false"/>
+ 
+ 		<antcall target="publishSDK"/>
++
++		<echo file="p2prep-stamp" />
+ 	</target>
+ 
+ 	<target name="createRepo">
+@@ -331,7 +337,7 @@
  		</java>
  	</target>
  
@@ -18,7 +51,7 @@ diff -Nur -x '*.orig' -x '*~' debian.git/build.xml debian.git.new/build.xml
  		<echo message="Installing into:  ${buildDirectory}/installation"/>
  		<antcall target="run.director">
  			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-@@ -344,6 +345,7 @@
+@@ -344,6 +350,7 @@
  			<param name="p2.arch" value="${buildArch}" />
  			<param name="p2.repo" value="${reposource}" />
  		</antcall>


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.