[maven2-core] 01/04: Fixed the parsing of DEB_CHANGELOG_DATETIME with non english locales

[Emmanuel Bourg]

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

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

commit 0795b30de36fa71b0da09938de5ca325b19ec15a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 24 12:33:13 2015 +0200

    Fixed the parsing of DEB_CHANGELOG_DATETIME with non english locales
---
 debian/changelog                                       | 7 +++++++
 debian/patches/0006-reproducible-built-timestamp.patch | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab48cad..f24f0a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven2-core (2.2.1-21) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the parsing of DEB_CHANGELOG_DATETIME with non english locales
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 22 Jun 2015 13:29:20 +0200
+
 maven2-core (2.2.1-20) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0006-reproducible-built-timestamp.patch b/debian/patches/0006-reproducible-built-timestamp.patch
index 5e07df3..b3b3279 100644
--- a/debian/patches/0006-reproducible-built-timestamp.patch
+++ b/debian/patches/0006-reproducible-built-timestamp.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
              if ( formattedDate == null && startTime != null )
              {
 -                formattedDate = new SimpleDateFormat( format ).format( startTime );
-+                SimpleDateFormat fmt = new SimpleDateFormat( format );
++                SimpleDateFormat fmt = new SimpleDateFormat( format, java.util.Locale.ENGLISH );
 +                Date debianBuildDate = getDebianBuildDate();
 +                if ( debianBuildDate == null ) {
 +                    formattedDate = fmt.format( startTime );
@@ -35,7 +35,7 @@ Forwarded: not-needed
 +        }
 +
 +        try {
-+            return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz").parse(envVariable);
++            return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", java.util.Locale.ENGLISH).parse(envVariable);
 +        } catch (Exception e) {
 +            throw new IllegalArgumentException(envName + " not in recognised format", e);
 +        }

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