[javatools] 01/01: Fixed the order of the -locale option (Closes: #789350)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository javatools.

commit fa33d097c23deedd326a99f4cab31b20aaeebfc5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jun 20 21:42:04 2015 +0200

    Fixed the order of the -locale option (Closes: #789350)
---
 debian/changelog | 7 +++++++
 jh_build         | 6 +-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8d41e..a90d991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.52) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the order of the -locale option (Closes: #789350)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 20 Jun 2015 21:41:58 +0200
+
 javatools (0.51) unstable; urgency=medium
 
   * Team upload.
diff --git a/jh_build b/jh_build
index 1ac8dc7..6e99dee 100755
--- a/jh_build
+++ b/jh_build
@@ -67,10 +67,6 @@ if ! grep -- -notimestamp <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
 	JH_JAVADOC_OPTS="-notimestamp $JH_JAVADOC_OPTS"
 fi
 
-if ! grep -- -locale <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
-        JH_JAVADOC_OPTS="-locale en_US $JH_JAVADOC_OPTS"
-fi
-
 function dobuild()
 {
 
@@ -166,7 +162,7 @@ function dobuild()
 }
 
 JAVAC="${JAVA_HOME}/bin/javac"
-JAVADOC="${JAVA_HOME}/bin/javadoc"
+JAVADOC="${JAVA_HOME}/bin/javadoc -locale en_US"
 JAR="${JAVA_HOME}/bin/jar"
 
 jarfile="${ARGV[0]}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git