[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-46-gda9de8d

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit 10874dbb7b4b28e541339d2d1befaa96679f1245
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jun 1 21:38:17 2012 +0200

    Disable useless failing patches (mostly SWT stuff)

diff --git a/debian/patches/disable-useless-patches.patch b/debian/patches/disable-useless-patches.patch
new file mode 100644
index 0000000..052dde6
--- /dev/null
+++ b/debian/patches/disable-useless-patches.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Fri, 1 Jun 2012 21:36:53 +0200
+Subject: disable-useless-patches
+
+---
+ build.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index b648a83..3320d2b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -380,7 +380,7 @@
+ 
+ 		<!--patch patchfile="${basedir}/patches/swt-no-api-generation.patch" dir="${buildDirectory}" strip="0" /-->
+ 
+-		<patch patchfile="${basedir}/patches/add-plugin-version-of-arm-launcher-fragment.patch" dir="${buildDirectory}" strip="1" />
++		<!--patch patchfile="${basedir}/patches/add-plugin-version-of-arm-launcher-fragment.patch" dir="${buildDirectory}" strip="1" /-->
+ 
+                 <delete dir="${buildDirectory}/plugins/org.eclipse.equinox.io/" />
+                 <delete dir="${buildDirectory}/plugins/org.eclipse.osgi.services/src/org/osgi/service/io/" />
diff --git a/debian/patches/series b/debian/patches/series
index cf96f90..4b88d4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ eclipse-help-feature-adjust-dependencies-lucene-vers.patch
 bump-ant-version.patch
 refresh-eclipse-nosourcebundlesfordependencies.patch
 install-new-icons.patch
+disable-useless-patches.patch
diff --git a/debian/patches/use-distribution-swt.patch b/debian/patches/use-distribution-swt.patch
index 5650647..42d0711 100644
--- a/debian/patches/use-distribution-swt.patch
+++ b/debian/patches/use-distribution-swt.patch
@@ -3,13 +3,13 @@ Date: Sat, 14 Jan 2012 21:02:09 +0100
 Subject: use-distribution-swt
 
 ---
- additionalArchs/rename.sh                          |    3 -
- build.xml                                          |   16 +++---
+ additionalArchs/rename.sh                          |    3 --
+ build.xml                                          |   18 ++++---
  dependencies/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 +--
- 6 files changed, 33 insertions(+), 70 deletions(-)
+ 6 files changed, 34 insertions(+), 71 deletions(-)
  create mode 100644 dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
 
 diff --git a/additionalArchs/rename.sh b/additionalArchs/rename.sh
@@ -24,7 +24,7 @@ index 1fe2754..4703a4b 100755
 -    moves
 -cd ..
 diff --git a/build.xml b/build.xml
-index 11cb1ad..f0b78ad 100644
+index 11cb1ad..578b1e8 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -170,6 +170,11 @@
@@ -71,6 +71,15 @@ index 11cb1ad..f0b78ad 100644
  		<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" />
  		
+@@ -378,7 +381,7 @@
+ 
+ 		<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
+ 
+-		<patch patchfile="${basedir}/patches/swt-no-api-generation.patch" dir="${buildDirectory}" strip="0" />
++		<!--patch patchfile="${basedir}/patches/swt-no-api-generation.patch" dir="${buildDirectory}" strip="0" /-->
+ 
+ 		<patch patchfile="${basedir}/patches/add-plugin-version-of-arm-launcher-fragment.patch" dir="${buildDirectory}" strip="1" />
+ 
 @@ -543,7 +546,6 @@
  				<include name="**/*.so" />
  			</fileset>
@@ -119,10 +128,10 @@ index 0000000..272d0e7
 +
 +
 diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
-index 55e4845..e1db66f 100644
+index 85932ce..ee08dfa 100644
 --- a/eclipse/features/org.eclipse.rcp/feature.xml
 +++ b/eclipse/features/org.eclipse.rcp/feature.xml
-@@ -198,39 +198,6 @@
+@@ -194,39 +194,6 @@
           unpack="false"/>
  
     <plugin
@@ -162,7 +171,7 @@ index 55e4845..e1db66f 100644
           id="org.eclipse.swt.gtk.solaris.sparc"
           os="solaris"
           ws="gtk"
-@@ -253,28 +220,6 @@
+@@ -249,28 +216,6 @@
           unpack="false"/>
  
     <plugin

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