[maven-doxia-tools] 05/35: fix the patch plexus-interpolation.diff

[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-doxia-tools.

commit 77ce743facba0d6282ab31f282f0f63b7899c4dc
Author: Torsten Werner <twerner at debian.org>
Date:   Wed Dec 17 15:03:07 2008 +0000

    fix the patch plexus-interpolation.diff
---
 debian/patches/plexus-interpolation.diff | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/patches/plexus-interpolation.diff b/debian/patches/plexus-interpolation.diff
index cddfa71..2d06a68 100644
--- a/debian/patches/plexus-interpolation.diff
+++ b/debian/patches/plexus-interpolation.diff
@@ -1,16 +1,24 @@
-diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-index 841918e..4bdbb8a 100644
---- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-+++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -45,6 +45,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
+Index: maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+===================================================================
+--- maven-doxia-tools-1.0.1.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-06-07 12:18:58.000000000 +0200
++++ maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-12-17 15:54:28.000000000 +0100
+@@ -45,10 +45,11 @@
  import org.codehaus.plexus.util.IOUtil;
  import org.codehaus.plexus.util.ReaderFactory;
  import org.codehaus.plexus.util.StringUtils;
+-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
 +import org.codehaus.plexus.interpolation.InterpolationException;
- import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
- import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
- import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
-@@ -664,7 +665,15 @@ public class DefaultSiteTool
++import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
++import org.codehaus.plexus.interpolation.MapBasedValueSource;
++import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
++import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+ 
+ import java.io.File;
+@@ -664,7 +665,15 @@
  
          interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
  

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