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

[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  31f5c3f7dae10bc6ce2ca5d389dd840623a133d8 (commit)
       via  acb13d0e4263ba4c7299bfbfc641496b20c0006e (commit)
       via  76d28892c0486d73243def165873a7a5e55655f9 (commit)
      from  25b5ae60993cb0a47f21e028c17117151b2d6c1a (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 31f5c3f7dae10bc6ce2ca5d389dd840623a133d8
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Feb 24 23:47:16 2010 +0100

    Made pde-build fail on unknown option and added description for the pdebuild patch.

commit acb13d0e4263ba4c7299bfbfc641496b20c0006e
Merge: 76d28892c0486d73243def165873a7a5e55655f9 25b5ae60993cb0a47f21e028c17117151b2d6c1a
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Feb 24 23:42:06 2010 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit 76d28892c0486d73243def165873a7a5e55655f9
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Feb 23 11:17:11 2010 +0100

    Removed unused install file.

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

Summary of changes:
 debian/eclipse-helper.install        |    2 --
 debian/patches/pdebuild-script.patch |   15 +++++++++++++++
 pdebuild/eclipse-pdebuild.sh         |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/eclipse-helper.install b/debian/eclipse-helper.install
deleted file mode 100644
index fdd9086..0000000
--- a/debian/eclipse-helper.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/helper/*.mk usr/share/eclipse-helper/
-debian/helper/eh_install usr/bin/
diff --git a/debian/patches/pdebuild-script.patch b/debian/patches/pdebuild-script.patch
index 9e68521..b62c1da 100644
--- a/debian/patches/pdebuild-script.patch
+++ b/debian/patches/pdebuild-script.patch
@@ -1,3 +1,7 @@
+Description: Remove Fedora specific parts, change paths and made pde-build fail
+ on unknown options.
+Author: Niels Thykier <niels at thykier.net>
+
 Index: debian.git/pdebuild/eclipse-pdebuild.sh
 ===================================================================
 --- debian.git.orig/pdebuild/eclipse-pdebuild.sh	2010-02-24 16:33:29.015338686 +0100
@@ -13,6 +17,15 @@ Index: debian.git/pdebuild/eclipse-pdebuild.sh
  
  featureId=
  dependencies=
+@@ -178,7 +178,7 @@ do
+              ;;
+          ?)
+              usage
+-             exit
++             exit 1
+              ;;
+      esac
+ done
 @@ -273,7 +273,7 @@
      -DbaseLocation=$SDK \
      -DsourceDirectory=$sourceDir \
@@ -31,3 +44,5 @@ Index: debian.git/pdebuild/eclipse-pdebuild.sh
      $orbitDeps \
      -Dtesting="$testing" \
      $additionalArgs \
+diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
+index 56d23f9..bf9f039 100755
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index 56d23f9..bf9f039 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -178,7 +178,7 @@ do
              ;;
          ?)
              usage
-             exit
+             exit 1
              ;;
      esac
 done


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