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 e726ac7fba265a578d76d25c19b23219e00357b3 (commit) from 2bc74386eb7efebef8177f3484552dd666d4a4e6 (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 e726ac7fba265a578d76d25c19b23219e00357b3 Author: Adnan Hodzic <ad...@foolcontrol.org> Date: Tue Jun 15 18:40:55 2010 +0200 fixes bashisms ----------------------------------------------------------------------- Summary of changes: debian/patches/bashism.patch | 40 --------------------- debian/patches/series | 1 + patches/eclipse-pde.build-add-package-build.patch | 10 +++--- 3 files changed, 6 insertions(+), 45 deletions(-) diff --git a/debian/patches/bashism.patch b/debian/patches/bashism.patch deleted file mode 100644 index 5b19224..0000000 --- a/debian/patches/bashism.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: eclipse/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh -=================================================================== ---- eclipse.orig/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh 2010-06-01 18:58:25.857923592 +0200 -+++ eclipse/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh 2010-06-01 19:02:10.853929638 +0200 -@@ -44,7 +44,7 @@ - PROJECTDIR=$(dirname "$f") - inSDK=1 - inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR) -- if [ $inSDK == 0 ]; then -+ if [ $inSDK = 0 ]; then - PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) - ERROR="" - if [ -z "$PROJECTNAME" ]; then -@@ -57,7 +57,7 @@ - fi - - if [ "x$ERROR" != "xyes" ]; then -- if [[ $TESTING != true || `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 -@@ -72,7 +72,7 @@ - ERROR="" - inSDK=1 - inSDK=$(echo $dir | grep -c $BUILDDIR) -- if [ $inSDK == 0 ]; then -+ if [ $inSDK = 0 ]; then - if [ -e "$dir/META-INF/MANIFEST.MF" ]; then - PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) - elif [ -e "$dir/plugin.xml" ]; then -@@ -91,7 +91,7 @@ - fi - - if [ "x$ERROR" != "xyes" ]; then -- if [[ $TESTING != true || `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 diff --git a/debian/patches/series b/debian/patches/series index a9df4b5..210dd21 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +bashisms.patch upstream-eclipse-build-repack.patch osgi-util.patch osgi-services.patch diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch index f5998ce..43f22a1 100644 --- a/patches/eclipse-pde.build-add-package-build.patch +++ b/patches/eclipse-pde.build-add-package-build.patch @@ -7,7 +7,7 @@ diff -N templates/package-build/prepare-build-dir.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,105 @@ -+#!/bin/sh ++#!/bin/bash + +if [ $# -lt 2 ]; then + echo "usage: $0 <path to source dir> <path to build dir>" @@ -53,7 +53,7 @@ diff -N templates/package-build/prepare-build-dir.sh + PROJECTDIR=$(dirname "$f") + inSDK=1 + inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR) -+ if [ $inSDK == 0 ]; then ++ if [ $inSDK = 0 ]; then + PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) + ERROR="" + if [ -z "$PROJECTNAME" ]; then @@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-build-dir.sh + fi + + if [ "x$ERROR" != "xyes" ]; then -+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then ++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then + echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" + ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME" + fi @@ -81,7 +81,7 @@ diff -N templates/package-build/prepare-build-dir.sh + ERROR="" + inSDK=1 + inSDK=$(echo $dir | grep -c $BUILDDIR) -+ if [ $inSDK == 0 ]; then ++ if [ $inSDK = 0 ]; then + if [ -e "$dir/META-INF/MANIFEST.MF" ]; then + PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) + elif [ -e "$dir/plugin.xml" ]; then @@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-build-dir.sh + fi + + if [ "x$ERROR" != "xyes" ]; then -+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then ++ if [ $TESTING != true -o `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. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits