[maven] 01/01: Updated modello.diff to use Guava instead of Google Collections (Closes: #725588)

[Emmanuel Bourg]

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

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

commit 337905a44eeb27195fc61d294642b49bd6636901
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 7 18:17:37 2013 +0200

    Updated modello.diff to use Guava instead of Google Collections (Closes: #725588)
---
 debian/changelog            |    8 ++++++++
 debian/patches/modello.diff |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index deaad60..1a7ccda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven (3.0.4-7) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Updated modello.diff to use Guava instead of Google Collections
+    (Closes: #725588)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Oct 2013 18:16:18 +0200
+
 maven (3.0.4-6) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/modello.diff b/debian/patches/modello.diff
index 876c46d..7083d39 100644
--- a/debian/patches/modello.diff
+++ b/debian/patches/modello.diff
@@ -28,7 +28,7 @@ Forwarded: not-needed
 +        <include name="plexus-build-api.jar"/>
 +        <include name="plexus-container-default.jar"/>
 +        <include name="classworlds.jar"/>
-+        <include name="google-collections.jar"/>
++        <include name="guava.jar"/>
 +        <include name="xbean-reflect.jar"/>
 +        <include name="plexus-classworlds.jar"/>
 +        <include name="plexus-utils.jar"/>

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