[maven-site-plugin] 05/36: fix patch pom.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-site-plugin.

commit 1e78e624904a3249496a62adabbadde31972f2c8
Author: Torsten Werner <twerner at debian.org>
Date:   Wed Dec 17 15:16:20 2008 +0000

    fix patch pom.diff
---
 debian/patches/pom.diff | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index 010cbbd..bd3d4c7 100644
--- a/debian/patches/pom.diff
+++ b/debian/patches/pom.diff
@@ -1,7 +1,7 @@
 Index: maven-site-plugin-2.0~beta7/pom.xml
 ===================================================================
---- maven-site-plugin-2.0~beta7.orig/pom.xml	2008-12-16 17:26:04.000000000 +0100
-+++ maven-site-plugin-2.0~beta7/pom.xml	2008-12-16 17:26:49.000000000 +0100
+--- maven-site-plugin-2.0~beta7.orig/pom.xml	2008-06-26 20:38:32.000000000 +0200
++++ maven-site-plugin-2.0~beta7/pom.xml	2008-12-16 17:40:20.000000000 +0100
 @@ -19,13 +19,16 @@
  -->
  
@@ -109,7 +109,7 @@ Index: maven-site-plugin-2.0~beta7/pom.xml
        <exclusions>
          <exclusion>
            <groupId>org.codehaus.plexus</groupId>
-@@ -303,23 +340,29 @@
+@@ -303,23 +340,22 @@
        <groupId>org.apache.maven.wagon</groupId>
        <artifactId>wagon-provider-api</artifactId>
        <version>${wagonVersion}</version>
@@ -122,17 +122,15 @@ Index: maven-site-plugin-2.0~beta7/pom.xml
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-archiver</artifactId>
 -      <version>1.0-alpha-7</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.codehaus.plexus</groupId>
+-      <artifactId>plexus-container-default</artifactId>
+-      <version>1.0-alpha-9</version>
 +      <version>${org.codehaus.plexus.plexus-archiver.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-container-default</artifactId>
-       <version>1.0-alpha-9</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/plexus-container-default.jar</systemPath>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-i18n</artifactId>
        <version>1.0-beta-7</version>
 +      <scope>system</scope>
@@ -140,7 +138,7 @@ Index: maven-site-plugin-2.0~beta7/pom.xml
        <exclusions>
          <exclusion>
            <groupId>org.codehaus.plexus</groupId>
-@@ -329,6 +372,14 @@
+@@ -329,6 +365,14 @@
      </dependency>
      <dependency>
        <groupId>org.codehaus.plexus</groupId>
@@ -155,7 +153,7 @@ Index: maven-site-plugin-2.0~beta7/pom.xml
        <artifactId>plexus-utils</artifactId>
        <version>1.5.1</version>
      </dependency>
-@@ -338,14 +389,31 @@
+@@ -338,14 +382,31 @@
        <artifactId>jetty</artifactId>
        <version>6.1.5</version>
      </dependency>

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