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

[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  135ab34818c72cf2f93763a415fe4560d03fe42d (commit)
      from  4f0fc9f465637a0544efe8041b8c8e02faae1eef (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 135ab34818c72cf2f93763a415fe4560d03fe42d
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 12 17:29:22 2009 +0200

    ... and make it apply.

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

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

diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
index 877c890..09080a3 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,7 +1,5 @@
-Index: build.xml
-===================================================================
---- a/build.xml	(revision 23415)
-+++ b/build.xml	(working copy)
+--- a/build.xml	2009-10-12 17:24:57.233753051 +0200
++++ b/build.xml	2009-10-12 17:27:50.017755737 +0200
 @@ -50,6 +50,9 @@
  			</or>
  		</and>
@@ -12,7 +10,7 @@ Index: build.xml
  
  	<target name="setLib64Dir" if="setLib64">
  		<property name="libDir" value="lib64" />
-@@ -291,8 +294,14 @@
+@@ -285,8 +288,14 @@
  		<echo file="testsbuild-stamp" />
  	</target>
  
@@ -28,16 +26,16 @@ Index: build.xml
  		<delete verbose="true">
  			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
  				<include name="eclipse" />
-@@ -300,7 +309,7 @@
+@@ -294,7 +303,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" />
-@@ -321,13 +330,7 @@
+ 		<ant antfile="build.xml"
+ 		     target="build.nativeLibraries"
+ 		     dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+@@ -317,14 +326,7 @@
  		<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
  		<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>
@@ -48,7 +46,8 @@ Index: build.xml
 -		</copy>
 -		<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}/">
 -		</move>-->
-+		<antcall target="compile.libgnomeproxy" />
- 		<!-- build libupdate -->
+-		<!-- build libupdate -->
++                <antcall target="compile.libgnomeproxy" />
  		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
  
+ 		<echo file="compilelibs-stamp" />


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