[SCM] UNNAMED PROJECT branch, master, updated. 0.33-3-g220d8e7

[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 "UNNAMED PROJECT".

The branch, master has been updated
       via  220d8e7e1b6689c7278c6cdefa8cb1c38dc3d5d1 (commit)
      from  505b399631433a51782703c58b1f8bdd518b40dd (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 220d8e7e1b6689c7278c6cdefa8cb1c38dc3d5d1
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 29 19:14:19 2011 +0200

    Made all jh_lib.sh based tools ignored -O

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

Summary of changes:
 debian/changelog |    4 ++++
 jh_lib.sh.in     |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efac41a..7e1ed36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ javatools (0.34) UNRELEASED; urgency=low
   * Removed the -O option from jh_build since it clashed with a
     common debhelper option.  The longer form (--javadoc-opts) is
     still available and should be used instead.
+  * Made all "jh_lib.sh"-based tools ignore the -O option, which is
+    used by dh in some cases.  If you have been using -O with
+    jh_build please switch to --javadoc-opts instead.
+    (Closes: #623506, #624388)
 
  -- Niels Thykier <niels at thykier.net>  Fri, 29 Apr 2011 08:41:18 +0200
 
diff --git a/jh_lib.sh.in b/jh_lib.sh.in
index acd5022..79fd3a9 100644
--- a/jh_lib.sh.in
+++ b/jh_lib.sh.in
@@ -20,6 +20,9 @@ parseargs()
       elif [ "--with" = "$1" ]; then
 			debhelper=true
 			shift
+      elif [ "-O" = "${1:0:2}" ]; then
+          # -O from debhelper - we ignore that
+          :
       elif [ "-" = "${1:1:1}" ]; then
       # long opt
          optn="`sed 's/^--\([^=]*\)\(=.*\)*$/\1/;s/-/_/g' <<< $1`"


hooks/post-receive
-- 
UNNAMED PROJECT