[SCM] UNNAMED PROJECT branch, master, updated. 0.36-5-g5df7ff5

[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  5df7ff57bf0d547551af0c8b72d5950e75c49987 (commit)
       via  3d4f70184f999de6c3f9d7c2081d6af3158f7468 (commit)
      from  e811a2154dfcd85ce8c9ce93356dc4d9adf14712 (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 5df7ff57bf0d547551af0c8b72d5950e75c49987
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jul 6 14:53:19 2011 +0200

    Release 0.37 into unstable

commit 3d4f70184f999de6c3f9d7c2081d6af3158f7468
Author: Matthew Johnson <mjj29 at debian.org>
Date:   Wed Jul 6 10:19:43 2011 +0100

    fix for #591874

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

Summary of changes:
 debian/changelog |    9 +++++++--
 jh_build         |    4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93f5a99..9b7708c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-javatools (0.37) UNRELEASED; urgency=low
+javatools (0.37) unstable; urgency=low
 
+  [ Niels Thykier ]
   * Do not assume that $pkg/usr/share/doc is present when jh_depends
     runs.  (Closes: #632620)
   * Applied changes from NMU.
@@ -7,7 +8,11 @@ javatools (0.37) UNRELEASED; urgency=low
   * Added support for -s/--same-arch in jh_lib and related shell
     scripts.  (Closes: #632619)
 
- -- Niels Thykier <niels at thykier.net>  Mon, 04 Jul 2011 09:17:23 +0200
+  [ Matthew Johnson ]
+  * Default to -source 1.5 in jh_build unless specified in the extra
+    args (Closes: #591874)
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 06 Jul 2011 14:53:12 +0200
 
 javatools (0.36) unstable; urgency=low
 
diff --git a/jh_build b/jh_build
index 3509956..8fb495f 100755
--- a/jh_build
+++ b/jh_build
@@ -51,6 +51,10 @@ fi
 JH_JAVAC_OPTS="`getarg o javacopts`"
 JH_JAVADOC_OPTS="`getarg O javadoc-opts`"
 
+if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+	JH_JAVAC_OPTS="-source 1.5 $JH_JAVAC_OPTS"
+fi
+
 function dobuild()
 {
 


hooks/post-receive
-- 
UNNAMED PROJECT