[doxia-sitetools] 07/37: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jul 28 12:59:45 UTC 2017


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 ea511f03f7a912e08ca044390232a922f2dce485
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 01:21:26 2017 +0200

    Refreshed the patches
---
 debian/changelog                                 |  2 +-
 debian/patches/0001-fix-for-lastModified.patch   |  2 +-
 debian/patches/0002-disable-plexus-javadoc.patch | 25 ------------------------
 debian/patches/series                            |  1 -
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 420c8fe..f4f16fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-doxia-sitetools (1.2-1) UNRELEASED; urgency=medium
+doxia-sitetools (1.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/0001-fix-for-lastModified.patch b/debian/patches/0001-fix-for-lastModified.patch
index 974f9a6..27c21bf 100644
--- a/debian/patches/0001-fix-for-lastModified.patch
+++ b/debian/patches/0001-fix-for-lastModified.patch
@@ -9,7 +9,7 @@ Subject: fix for lastModified
 
 --- 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
-@@ -295,8 +295,7 @@
+@@ -297,8 +297,7 @@
  
              File inputFile = new File( renderingContext.getBasedir(), renderingContext.getInputName() );
  
diff --git a/debian/patches/0002-disable-plexus-javadoc.patch b/debian/patches/0002-disable-plexus-javadoc.patch
deleted file mode 100644
index adc4183..0000000
--- a/debian/patches/0002-disable-plexus-javadoc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 10 Sep 2011 17:39:02 +0200
-Subject: disable plexus-javadoc
-
-There is a dependency that cannot be resolved.
----
- pom.xml |    7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -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-component-javadoc</artifactId>
--                <version>1.5.5</version>
--              </tagletArtifact>
--            </tagletArtifacts>
-           </configuration>
-         </plugin>
-         <plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 926bb5e..68e88e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-fix-for-lastModified.patch
-0002-disable-plexus-javadoc.patch

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



More information about the pkg-java-commits mailing list