[mvel] 09/42: Fix Java7 FTBFS, remove duplicate fields in d/copyright and add missing --java-lib to d/*.poms

[Emmanuel Bourg]

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

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

commit 875fc29c41dc4d2ea12975b9fe78db7042079b44
Author: Niels Thykier <nthykier at debian.org>
Date:   Wed Jun 20 19:16:31 2012 +0000

    Fix Java7 FTBFS, remove duplicate fields in d/copyright and add missing --java-lib to d/*.poms
---
 debian/changelog         | 9 +++++++++
 debian/copyright         | 6 +++---
 debian/libmvel-java.poms | 2 +-
 debian/maven.properties  | 3 +++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27dcae6..5cc7b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/copyright b/debian/copyright
index f5d8a06..032c475 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Source: http://mvel.codehaus.org/
 
 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/*
diff --git a/debian/libmvel-java.poms b/debian/libmvel-java.poms
index d4f7111..7a94403 100644
--- a/debian/libmvel-java.poms
+++ b/debian/libmvel-java.poms
@@ -1 +1 @@
-pom.xml
+pom.xml --java-lib
diff --git a/debian/maven.properties b/debian/maven.properties
index d2f1b82..e45ae97 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1 +1,4 @@
 maven.test.skip=true
+
+project.build.sourceEncoding=ISO-8859-1
+

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