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

[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-3.6 has been updated
       via  efc6fcd41f3869d993ddb4fbab4665bd23eeea24 (commit)
       via  f4480f058b86091f411f9d26c14f3b0d735ced88 (commit)
       via  c4581570d622c04e03188f20aeb9f2149dff5724 (commit)
      from  79b66fcf6c64b2876cdb5c815f73d6b845ff0b37 (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 efc6fcd41f3869d993ddb4fbab4665bd23eeea24
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Nov 19 17:11:56 2010 +0100

    Ignore .pc directory.

commit f4480f058b86091f411f9d26c14f3b0d735ced88
Merge: 79b66fc c458157
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Nov 19 17:10:43 2010 +0100

    Merge branch 'upstream-3.6' into master-3.6

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

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
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.