[doxia-sitetools] 05/37: 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 doxia-sitetools.

commit 6a302f440aa0e3734a91db3090363a9a07dc0e45
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 01:10:20 2017 +0200

    Refreshed the patches
---
 debian/changelog                                 |  4 +++-
 debian/patches/0001-fix-for-lastModified.patch   | 21 +--------------------
 debian/patches/0002-disable-plexus-javadoc.patch |  9 +++------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 845b5fe..420c8fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-doxia-sitetools (1.1.4-2) UNRELEASED; urgency=medium
+doxia-sitetools (1.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/patches/0001-fix-for-lastModified.patch b/debian/patches/0001-fix-for-lastModified.patch
index 40b1018..974f9a6 100644
--- a/debian/patches/0001-fix-for-lastModified.patch
+++ b/debian/patches/0001-fix-for-lastModified.patch
@@ -7,27 +7,9 @@ Subject: fix for lastModified
  .../doxia/siterenderer/DefaultSiteRenderer.java    |    3 +--
  2 files changed, 1 insertions(+), 7 deletions(-)
 
-diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
-index e1734f0..cb4d8f3 100644
---- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
-+++ b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
-@@ -83,11 +83,6 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod
- 
-             child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(), urlContainer ) );
- 
--            if ( parent.getLastModified() > child.getLastModified() )
--            {
--                child.setLastModified( parent.getLastModified() );
--            }
--
-             assembleBodyInheritance( name, child, parent, urlContainer );
- 
-             assembleCustomInheritance( child, parent );
-diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
-index a396281..21e7c3b 100644
 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
-@@ -308,8 +308,7 @@ public class DefaultSiteRenderer
+@@ -295,8 +295,7 @@
  
              File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName() );
  
@@ -37,4 +19,3 @@ index a396281..21e7c3b 100644
  
              if ( modified || docRenderer.isOverwrite() )
              {
--- 
diff --git a/debian/patches/0002-disable-plexus-javadoc.patch b/debian/patches/0002-disable-plexus-javadoc.patch
index 14bfc27..adc4183 100644
--- a/debian/patches/0002-disable-plexus-javadoc.patch
+++ b/debian/patches/0002-disable-plexus-javadoc.patch
@@ -7,22 +7,19 @@ There is a dependency that cannot be resolved.
  pom.xml |    7 -------
  1 files changed, 0 insertions(+), 7 deletions(-)
 
-diff --git a/pom.xml b/pom.xml
-index f6259dc..8299e8a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -260,13 +260,6 @@ under the License.
+@@ -266,13 +266,6 @@
                <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
                <link>http://junit.sourceforge.net/javadoc/</link>
              </links>
 -            <tagletArtifacts>
 -              <tagletArtifact>
 -                <groupId>org.codehaus.plexus</groupId>
--                <artifactId>plexus-javadoc</artifactId>
--                <version>1.0</version>
+-                <artifactId>plexus-component-javadoc</artifactId>
+-                <version>1.5.5</version>
 -              </tagletArtifact>
 -            </tagletArtifacts>
            </configuration>
          </plugin>
          <plugin>
--- 

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