[SCM] acegi-security packaging branch, master, updated. debian/1.0.7-1-1-g137f3a5

[James Page]

The following commit has been merged in the master branch:
commit 137f3a5a92c9c878760bbf785661a265ac5a485e
Author: James Page <james.page at ubuntu.com>
Date:   Tue Dec 6 15:21:19 2011 +0000

    Fix FTBFS with OpenJDK 7:
    
    * Fix FTBFS with OpenJDK 7:
      - d/maven.properties: Specify source encoding to ensure javadoc
        generation completes successfully with Java 7.

diff --git a/debian/changelog b/debian/changelog
index b229d5c..6fa5d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+acegi-security (1.0.7-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with OpenJDK 7:
+    - d/maven.properties: Specify source encoding to ensure javadoc
+      generation completes successfully with Java 7.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 06 Dec 2011 15:20:05 +0000
+
 acegi-security (1.0.7-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #643759)
diff --git a/debian/maven.properties b/debian/maven.properties
index e593715..0b23b46 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -3,3 +3,5 @@
 # maven.test.skip=true
 
 maven.test.skip=true
+# Set encoding for compatibilty with Java 7
+project.build.sourceEncoding=ISO-8859-1

-- 
acegi-security packaging