[pkg-java] r16178 - trunk/mvel/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-20 19:16:31 +0000 (Wed, 20 Jun 2012)
New Revision: 16178

Modified:
   trunk/mvel/debian/changelog
   trunk/mvel/debian/copyright
   trunk/mvel/debian/libmvel-java.poms
   trunk/mvel/debian/maven.properties
Log:
Fix Java7 FTBFS, remove duplicate fields in d/copyright and add missing --java-lib to d/*.poms

Modified: trunk/mvel/debian/changelog
===================================================================
--- trunk/mvel/debian/changelog	2012-06-20 16:01:34 UTC (rev 16177)
+++ trunk/mvel/debian/changelog	2012-06-20 19:16:31 UTC (rev 16178)
@@ -1,3 +1,12 @@
+mvel (2.0.18-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Explicitly give encoding to fix FTBFS with Java7.
+  * Remove duplicate fields in d/copyright.
+  * Add missing --java-lib in d/libmvel-java.poms.
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 20 Jun 2012 21:09:56 +0200
+
 mvel (2.0.18-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/mvel/debian/copyright
===================================================================
--- trunk/mvel/debian/copyright	2012-06-20 16:01:34 UTC (rev 16177)
+++ trunk/mvel/debian/copyright	2012-06-20 19:16:31 UTC (rev 16178)
@@ -5,9 +5,9 @@
 
 Files: *
 Copyright: 2007 The Codehaus, Mike Brock, Dhanji Prasanna, John Graham, Mark Proctor
-Copyright: 2007-2008 The Codehaus, Christopher Brock
-Copyright: 2007 MVFLEX/Valhalla Project
-Copyright: 2005 JBoss Inc
+           2007-2008 The Codehaus, Christopher Brock
+           2007 MVFLEX/Valhalla Project
+           2005 JBoss Inc
 License: Apache-2.0
 
 Files: debian/*

Modified: trunk/mvel/debian/libmvel-java.poms
===================================================================
--- trunk/mvel/debian/libmvel-java.poms	2012-06-20 16:01:34 UTC (rev 16177)
+++ trunk/mvel/debian/libmvel-java.poms	2012-06-20 19:16:31 UTC (rev 16178)
@@ -1 +1 @@
-pom.xml
+pom.xml --java-lib

Modified: trunk/mvel/debian/maven.properties
===================================================================
--- trunk/mvel/debian/maven.properties	2012-06-20 16:01:34 UTC (rev 16177)
+++ trunk/mvel/debian/maven.properties	2012-06-20 19:16:31 UTC (rev 16178)
@@ -1 +1,4 @@
 maven.test.skip=true
+
+project.build.sourceEncoding=ISO-8859-1
+