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

[Niels Thykier]

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  18549f34cccc5d7cfdfc44bbb88eb0e3e0b93750 (commit)
      from  6579be6a4e2e30bf619b62b24a65264ef0b4344d (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 18549f34cccc5d7cfdfc44bbb88eb0e3e0b93750
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 12 16:45:13 2009 +0200

    Corrections

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

Summary of changes:
 debian/patches/libgnomeproxy.patch |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
index ab57985..a294a35 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,11 +1,9 @@
 Description: Patch to only rebuild libgnomeproxy on supported archs (to be send upstream).
 Author: Niels Thykier <niels at thykier.net>
 
-Index: build.xml
-===================================================================
---- a/build.xml	(revision 23415)
-+++ b/build.xml	(working copy)
-@@ -292,7 +292,6 @@
+-- a/build.xml	2009-10-12 16:36:57.277758180 +0200
++++ b/build.xml	2009-10-12 16:39:14.291675886 +0200
+@@ -286,7 +286,6 @@
  	</target>
  
  	<target name="compilelibs" unless="compilelibs.complete">
@@ -13,16 +11,16 @@ Index: build.xml
  		<delete verbose="true">
  			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
  				<include name="eclipse" />
-@@ -300,7 +299,7 @@
+@@ -294,7 +293,7 @@
  			<fileset dir="${buildDirectory}">
  				<include name="**/*.so" />
  			</fileset>
 -		</delete>-->
 +		</delete>
- 		<ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
- 
- 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
-@@ -322,12 +321,14 @@
+ 		<ant antfile="build.xml"
+ 		     target="build.nativeLibraries"
+ 		     dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+@@ -318,12 +317,14 @@
  		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
  		</move>
  		<!-- build libgnomeproxy -->
@@ -39,7 +37,7 @@ Index: build.xml
 +		    <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
 +		    <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
 +		  </then>
-+		</fi>
++		</if>
  		<!-- build libupdate -->
  		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
  


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