[maven-javadoc-plugin] 02/05: Refreshed the patches

[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-javadoc-plugin.

commit 07e06ee5f773d87b721cd685a7e5d23e09bbb7f2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 4 17:12:58 2015 +0200

    Refreshed the patches
---
 debian/changelog                                             |  8 ++++++++
 debian/patches/doxia1_1.patch                                | 11 -----------
 debian/patches/fix-unmappable-characters.patch               |  2 +-
 debian/patches/missing-maven-plugin-plugin-declaration.patch |  2 +-
 debian/patches/plexus-utils2-compatibility.patch             |  2 +-
 debian/patches/series                                        |  1 -
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ec6463..dc9d5fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven-javadoc-plugin (2.10.3-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches and removed doxia1_1.patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 May 2015 17:02:04 +0200
+
 maven-javadoc-plugin (2.10.2-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/doxia1_1.patch b/debian/patches/doxia1_1.patch
deleted file mode 100644
index eecf8ce..0000000
--- a/debian/patches/doxia1_1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
-+++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
-@@ -19,7 +19,7 @@
-  * under the License.
-  */
- 
--import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-+import org.apache.maven.doxia.sink.render.RenderingContext;
- import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
- import org.apache.maven.plugin.MojoExecutionException;
- import org.apache.maven.plugin.MojoFailureException;
diff --git a/debian/patches/fix-unmappable-characters.patch b/debian/patches/fix-unmappable-characters.patch
index 9877b23..865bead 100644
--- a/debian/patches/fix-unmappable-characters.patch
+++ b/debian/patches/fix-unmappable-characters.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
 +++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
-@@ -634,7 +634,7 @@
+@@ -639,7 +639,7 @@
       * </tr>
       * <tr>
       *   <td>IBM 1.5 (French JVM)</td>
diff --git a/debian/patches/missing-maven-plugin-plugin-declaration.patch b/debian/patches/missing-maven-plugin-plugin-declaration.patch
index d941794..4095387 100644
--- a/debian/patches/missing-maven-plugin-plugin-declaration.patch
+++ b/debian/patches/missing-maven-plugin-plugin-declaration.patch
@@ -17,7 +17,7 @@ Forwarded: not-needed
            <artifactId>maven-shade-plugin</artifactId>
            <version>1.7.1</version>
          </plugin>
-@@ -321,6 +328,17 @@
+@@ -323,6 +330,17 @@
          </configuration>
        </plugin>
        <plugin>
diff --git a/debian/patches/plexus-utils2-compatibility.patch b/debian/patches/plexus-utils2-compatibility.patch
index e10919f..f6f7f7d 100644
--- a/debian/patches/plexus-utils2-compatibility.patch
+++ b/debian/patches/plexus-utils2-compatibility.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 +++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
-@@ -5150,7 +5150,7 @@
+@@ -5239,7 +5239,7 @@
                      StringUtils.replaceOnce( fileContents, "function loadFrames() {", fixData );
                  if ( !patchedFileContents.equals( fileContents ) )
                  {
diff --git a/debian/patches/series b/debian/patches/series
index 12780b5..b5339b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-doxia1_1.patch
 plexus-utils2-compatibility.patch
 fix-unmappable-characters.patch
 missing-maven-plugin-plugin-declaration.patch

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