[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-17-gd408265

[Jakub Adam]

The following commit has been merged in the master branch:
commit 1ebf02518fb3cb5c8ba71c1ceeff366fb4591aba
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Mar 11 13:09:49 2012 +0100

    Disable failing swt patches from eclipse-build
    
    These are harmless as SWT is not built, but resulting build log
    with many patch failures might look scary to someone so disabling them.

diff --git a/debian/patches/use-distribution-swt.patch b/debian/patches/use-distribution-swt.patch
index 2ce9824..eb126ad 100644
--- a/debian/patches/use-distribution-swt.patch
+++ b/debian/patches/use-distribution-swt.patch
@@ -3,16 +3,16 @@ Date: Sat, 14 Jan 2012 21:02:09 +0100
 Subject: use-distribution-swt
 
 ---
- build.xml                                          |    8 ++-
+ build.xml                                          |   14 +++--
  dependencies.properties                            |    1 +
  .../org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF |   21 ++++++++
  eclipse/features/org.eclipse.rcp/feature.xml       |   55 --------------------
  pdebuild.xml                                       |    7 +--
- 5 files changed, 30 insertions(+), 62 deletions(-)
+ 5 files changed, 33 insertions(+), 65 deletions(-)
  create mode 100644 dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
 
 diff --git a/build.xml b/build.xml
-index f5e468f..e5633ea 100644
+index f5e468f..9aa207c 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -171,6 +171,11 @@
@@ -27,6 +27,23 @@ index f5e468f..e5633ea 100644
  	</target>
  
  	<available file="${basedir}/eclipse-build-feature" property="buildFeaturePresent" value="true" />
+@@ -304,13 +309,13 @@
+ 
+ 	<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
+ 		<!-- eclipse-build-only patches -->
+-		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
++		<!--patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" /-->
+ 		<!--
+ 		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
+ 		-->
+-		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
++		<!--patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" /-->
+ 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
+-		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
++		<!--patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" /-->
+ 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
 @@ -320,7 +325,7 @@
  		<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
  		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
@@ -84,7 +101,7 @@ index 0000000..272d0e7
 +
 +
 diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
-index 2f15286..beaeca1 100644
+index 4c2bd75..79130fd 100644
 --- a/eclipse/features/org.eclipse.rcp/feature.xml
 +++ b/eclipse/features/org.eclipse.rcp/feature.xml
 @@ -208,39 +208,6 @@
@@ -188,4 +205,3 @@ index 431eaf6..976af90 100644
  		<unzip dest="bootstrap/plugins">
  			<fileset dir="bootstrap/plugins">
  				<include name="**/*.zip" />
--- 

-- 
eclipse - Powerful IDE written in java - Debian package.