[SCM] UNNAMED PROJECT branch, master, updated. 0.33-2-g505b399

[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  505b399631433a51782703c58b1f8bdd518b40dd (commit)
      from  4b3112fdca0ffd0ee5f37e2314acf938371ede1b (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 505b399631433a51782703c58b1f8bdd518b40dd
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 29 19:02:43 2011 +0200

    Removed the -O option from jh_build, its longer form still works

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

Summary of changes:
 debian/changelog |    3 +++
 jh_build         |    2 +-
 jh_build.1       |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93cc4b5..efac41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ javatools (0.34) UNRELEASED; urgency=low
   * Fixed a regression in 0.33 that in some cases would make
     jh_installlibs install in to the system root and not the package
     root.  (Closes: #624503)
+  * 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.
 
  -- Niels Thykier <niels at thykier.net>  Fri, 29 Apr 2011 08:41:18 +0200
 
diff --git a/jh_build b/jh_build
index 8c8edda..3509956 100755
--- a/jh_build
+++ b/jh_build
@@ -18,7 +18,7 @@ syntax()
    echo -e "\t--clean: clean the build tree"
    echo -e "\t-N --no-javadoc: Disable building javadoc"
    echo -e "\t-J --javadoc: Enable building javadoc"
-   echo -e "\t-O<javadoc-opts> --javadoc-opts=<javadoc-opts>: Options to javadoc"
+   echo -e "\t--javadoc-opts=<javadoc-opts>: Options to javadoc"
    echo -e "Environment Variables:"
    echo -e "\tJAVA_HOME: path to the JDK to use"
    echo -e "\tCLASSPATH: classpath to compile with and set in the manifest"
diff --git a/jh_build.1 b/jh_build.1
index 281356e..f559a91 100644
--- a/jh_build.1
+++ b/jh_build.1
@@ -22,7 +22,7 @@ Refer to the tutorials in /usr/share/doc/javahelper for more detail
 .HP
 \fB\-N\fR \fB\-\-no-javadoc\fR: Don't build javadoc
 .HP
-\fB\-O\fR<javadocc\-opts> \fB\-\-javadoc-opts=\fR<javadocc\-opts>: Options to the Javadoc compiler
+\fB\-\-javadoc-opts=\fR<javadocc\-opts>: Options to the Javadoc compiler
 .HP
 \fB\-\-clean\fR: clean the build tree
 .SS "Environment Variables:"


hooks/post-receive
-- 
UNNAMED PROJECT