[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. eclipse-ppa/maverick-46-gd3424c71

[Benjamin Drung]

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  d3424c71940bc3ed1c6cdaed6a5431067630fa5c (commit)
      from  d07b6e58dd85e8e753aa79a7b9b0910f5e4df241 (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 d3424c71940bc3ed1c6cdaed6a5431067630fa5c
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Jun 29 15:12:32 2010 +0200

    Fix pattern matching to detect correct architecture.

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

Summary of changes:
 build.xml                       |    6 +++---
 debian/patches/build-arch.patch |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 1bd5fd2..b938024 100644
--- a/build.xml
+++ b/build.xml
@@ -58,13 +58,13 @@
 		<arg line="-m" />
 	</exec>
 	<condition property="hostArch" value="arm">
-		<matches pattern="arm*" string="${uname-m}"/>
+		<matches pattern="^arm.*" string="${uname-m}"/>
 	</condition>
 	<condition property="hostArch" value="x86">
 		<matches pattern="i[0-9]*86" string="${uname-m}"/>
 	</condition>
 	<condition property="hostArch" value="PA_RISC">
-		<matches pattern="parisc*" string="${uname-m}"/>
+		<matches pattern="^parisc.*" string="${uname-m}"/>
 	</condition>
 	<condition property="hostArch" value="sparc">
 		<matches pattern="sparcv9" string="${uname-m}"/>
@@ -75,7 +75,7 @@
 	<condition property="buildArch" value="${hostArch}">
 		<not><isset property="buildArch" /></not>
 	</condition>
-	<echo message="Build on ${hostArch} for ${buildArch}."/>
+	<echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
 
 	<property name="destDir" value="" />
 	<property name="prefix" value="/usr/local" />
diff --git a/debian/patches/build-arch.patch b/debian/patches/build-arch.patch
index 997dab7..7f70dd9 100644
--- a/debian/patches/build-arch.patch
+++ b/debian/patches/build-arch.patch
@@ -13,13 +13,13 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
 +		<arg line="-m" />
 +	</exec>
 +	<condition property="hostArch" value="arm">
-+		<matches pattern="arm*" string="${uname-m}"/>
++		<matches pattern="^arm.*" string="${uname-m}"/>
 +	</condition>
 +	<condition property="hostArch" value="x86">
 +		<matches pattern="i[0-9]*86" string="${uname-m}"/>
 +	</condition>
 +	<condition property="hostArch" value="PA_RISC">
-+		<matches pattern="parisc*" string="${uname-m}"/>
++		<matches pattern="^parisc.*" string="${uname-m}"/>
 +	</condition>
 +	<condition property="hostArch" value="sparc">
 +		<matches pattern="sparcv9" string="${uname-m}"/>
@@ -30,7 +30,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
 +	<condition property="buildArch" value="${hostArch}">
 +		<not><isset property="buildArch" /></not>
 +	</condition>
-+	<echo message="Build on ${hostArch} for ${buildArch}."/>
++	<echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
 +
  	<property name="destDir" value="" />
  	<property name="prefix" value="/usr/local" />


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