[jtidy] 14/30: Fix FTBFS with OpenJDK7

[Emmanuel Bourg]

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

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

commit 82bc93982ffce33ca0ea6de72c35beafec5f7499
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Dec 10 01:04:09 2011 +0000

    Fix FTBFS with OpenJDK7
---
 debian/changelog        | 13 +++++++++++++
 debian/control          |  2 +-
 debian/maven.properties |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cf4ece..49f5fba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jtidy (7+svn20110807-3) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888956) (Closes: #651534):
+    - d/maven.rules: Specify source file encoding to fix javadoc 
+      generation with Java 7. 
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 09 Dec 2011 20:07:32 -0430
+
 jtidy (7+svn20110807-2) unstable; urgency=high
 
   * Team upload
diff --git a/debian/control b/debian/control
index de554d7..74048f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, junit4, liblog4j1.2-java, libslf4j-java,  
  default-jdk-doc, ant, ant-doc 
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jtidy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jtidy
 Homepage: http://jtidy.sourceforge.net/
diff --git a/debian/maven.properties b/debian/maven.properties
index 7c29bd7..0b71dd3 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,4 +1,5 @@
 # Include here properties to pass to Maven during the build.
 # For example:
 # maven.test.skip=true
-
+# Set encoding for compatibilty with Java 7
+project.build.sourceEncoding=ISO-8859-1

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