[eigenbase-resgen] 16/17: Use the scm-safe comment style by default

[Emmanuel Bourg]

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

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

commit 2985d7ca1efea8c4d3c43be95f878dcb892a30b3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 9 16:51:55 2015 +0100

    Use the scm-safe comment style by default
---
 debian/changelog                          |  1 +
 debian/patches/default-comment-style.diff | 14 ++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da3a0cf..070e89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ eigenbase-resgen (1.3.0.13768-2) UNRELEASED; urgency=medium
   * Removed the src-html from the javadoc
   * Improved the reproducibility:
     - Set the locale and disable the timestamps when generating the javadoc
+    - Use the scm-safe comment style by default
   * debian/control:
     - Standards-Version updated to 3.9.6 (no changes)
     - Co-maintenance with the Java Team
diff --git a/debian/patches/default-comment-style.diff b/debian/patches/default-comment-style.diff
new file mode 100644
index 0000000..70af049
--- /dev/null
+++ b/debian/patches/default-comment-style.diff
@@ -0,0 +1,14 @@
+Description: Use the scm-safe comment style by default (improves the reproducibility)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/org/eigenbase/resgen/ResourceGenTask.java
++++ b/src/org/eigenbase/resgen/ResourceGenTask.java
+@@ -164,7 +164,7 @@
+     int style = STYLE_DYNAMIC;
+     String locales;
+     boolean force;
+-    int commentStyle = COMMENT_STYLE_NORMAL;
++    int commentStyle = COMMENT_STYLE_SCM_SAFE;
+ 
+     private static final int MODE_UNKNOWN = -1;
+     private static final int MODE_JAVA = 1;
diff --git a/debian/patches/series b/debian/patches/series
index 016aa02..0185645 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 javadoc.diff
+default-comment-style.diff

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