[pkg-java] r15520 - trunk/jtidy/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-10 01:04:09 +0000 (Sat, 10 Dec 2011)
New Revision: 15520

Modified:
   trunk/jtidy/debian/changelog
   trunk/jtidy/debian/control
   trunk/jtidy/debian/maven.properties
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/jtidy/debian/changelog
===================================================================
--- trunk/jtidy/debian/changelog	2011-12-10 00:08:39 UTC (rev 15519)
+++ trunk/jtidy/debian/changelog	2011-12-10 01:04:09 UTC (rev 15520)
@@ -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

Modified: trunk/jtidy/debian/control
===================================================================
--- trunk/jtidy/debian/control	2011-12-10 00:08:39 UTC (rev 15519)
+++ trunk/jtidy/debian/control	2011-12-10 01:04:09 UTC (rev 15520)
@@ -6,7 +6,7 @@
 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/

Modified: trunk/jtidy/debian/maven.properties
===================================================================
--- trunk/jtidy/debian/maven.properties	2011-12-10 00:08:39 UTC (rev 15519)
+++ trunk/jtidy/debian/maven.properties	2011-12-10 01:04:09 UTC (rev 15520)
@@ -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