[SCM] UNNAMED PROJECT branch, master, updated. 0.42-3-g965fbe4

[Niels Thykier]

The following commit has been merged in the master branch:
commit e7a63ebeb7f271e3879cdf50a56d15d6e07d4bce
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 20 18:57:18 2012 +0200

    jh_build: Pass -source 1.5 to javadoc if -source is not given
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index fbdfa3e..b0fa238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.43) UNRELEASED; urgency=low
+
+  * Make jh_build pass -source 1.5 by default to javadoc if
+    no -source parameter is explicitly given.
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 20 Jun 2012 18:56:47 +0200
+
 javatools (0.42) unstable; urgency=low
 
   * Add support for Java7 in jh_depends.  The jvm "open" now
diff --git a/jh_build b/jh_build
index c5dd2d6..f81404b 100755
--- a/jh_build
+++ b/jh_build
@@ -55,6 +55,10 @@ if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
 	JH_JAVAC_OPTS="-source 1.5 $JH_JAVAC_OPTS"
 fi
 
+if ! grep -- -source <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
+	JH_JAVADOC_OPTS="-source 1.5 $JH_JAVADOC_OPTS"
+fi
+
 function dobuild()
 {
 

-- 
UNNAMED PROJECT