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

[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  6579be6a4e2e30bf619b62b24a65264ef0b4344d (commit)
      from  7e7e5e9cd7b78b402724bc11aec80cdd066a3cb9 (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 6579be6a4e2e30bf619b62b24a65264ef0b4344d
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 12 15:58:01 2009 +0200

    Added libgnomeproxy patch.

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

Summary of changes:
 debian/patches/libgnomeproxy.patch |   45 ++++++++++++++++++++++++++++++++++++
 debian/patches/series              |    3 +-
 2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
new file mode 100644
index 0000000..ab57985
--- /dev/null
+++ b/debian/patches/libgnomeproxy.patch
@@ -0,0 +1,45 @@
+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 @@
+ 	</target>
+ 
+ 	<target name="compilelibs" unless="compilelibs.complete">
+-		<!-- TODO: Reenable when libgnomeproxy build is fixed.
+ 		<delete verbose="true">
+ 			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
+ 				<include name="eclipse" />
+@@ -300,7 +299,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 @@
+ 		<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 -->
+-		<!-- TODO: Reenable when libgnomeproxy build is fixed.
+-		<exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
+-		<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}/">
+-		</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>-->
++		<if>
++		  <equals arg1="${buildArch}" arg2="x86" />
++		  <then>
++		    <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
++		    <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>
+ 		<!-- build libupdate -->
+ 		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 44dcc7f..a985a27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 eclipse-build.patch
 fix-perm.patch
-symlink.patch
\ No newline at end of file
+symlink.patch
+libgnomeproxy.patch


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