[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream-3.6, updated. c4581570d622c04e03188f20aeb9f2149dff5724

[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, upstream-3.6 has been updated
       via  c4581570d622c04e03188f20aeb9f2149dff5724 (commit)
      from  c87c8524df271c61bd838a7b96c506efebfd8389 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                         |    6 ++++++
 patches/eclipse-pde.build-add-package-build.patch |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c72cfdb..109c27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-26  Severin Gehwolf <sgehwolf at redhat.com>
+
+	* patches/eclipse-pde.build-add-package-build.patch: Fix the
+	  patch. Earlier version produced syntax errors such as:
+	  'prepare-build-dir.sh: line 60: [: argument expected'
+
 2010-10-02  Alexander Kurtakov  <akurtako at redhat.com>
 
 	* build.properties: Update for 3.6.1.
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index a7039c5..b374ccc 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -62,7 +62,7 @@
 +    fi
 +
 +    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
 +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
 +        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
 +      fi
@@ -96,7 +96,7 @@
 +    fi
 +
 +    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
 +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
 +        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
 +      fi


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