[doxia] 07/35: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jul 28 11:19:13 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.
commit b4066a807b4b16985c60d84890c16c008f99ca39
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 27 20:20:38 2017 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
debian/patches/0001-modello.patch | 7 +-----
...2-add-version-to-plexus-container-default.patch | 5 +----
.../0003-switch-to-plexus-component-metadata.patch | 25 ++++++----------------
debian/patches/0007-disable-plexus-javadoc.patch | 9 +++-----
debian/patches/0008-fop2-compatibility.patch | 2 +-
6 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2f72e0d..9d079d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-doxia (1.1.4-8) UNRELEASED; urgency=medium
+doxia (1.2-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* Removed the unused dependency on libmaven2-core-java
* Depend on libplexus-container-default1.5-java
instead of libplexus-containers-java
diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch
index 7f3cd8d..dde681b 100644
--- a/debian/patches/0001-modello.patch
+++ b/debian/patches/0001-modello.patch
@@ -7,8 +7,6 @@ Subject: modello
.../maven/doxia/module/fo/FoAggregateSink.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
-diff --git a/doxia-core/src/main/mdo/document.mdo b/doxia-core/src/main/mdo/document.mdo
-index a338c49..1807f42 100644
--- a/doxia-core/src/main/mdo/document.mdo
+++ b/doxia-core/src/main/mdo/document.mdo
@@ -500,7 +500,7 @@
@@ -83,11 +81,9 @@ index a338c49..1807f42 100644
}
]]>
</code>
-diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
-index 72d6789..7aa1d63 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
-@@ -1219,7 +1219,7 @@ public class FoAggregateSink
+@@ -1214,7 +1214,7 @@
att.addAttribute( "height", "0.3in" );
att.addAttribute( "text-align", "left" );
writeStartTag( BLOCK_TAG, att );
@@ -96,4 +92,3 @@ index 72d6789..7aa1d63 100644
writeEndTag( BLOCK_TAG );
writeEndTag( TABLE_CELL_TAG );
---
diff --git a/debian/patches/0002-add-version-to-plexus-container-default.patch b/debian/patches/0002-add-version-to-plexus-container-default.patch
index 67b259b..0a508fa 100644
--- a/debian/patches/0002-add-version-to-plexus-container-default.patch
+++ b/debian/patches/0002-add-version-to-plexus-container-default.patch
@@ -6,11 +6,9 @@ Subject: add version to plexus-container-default
doxia-logging-api/pom.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
-diff --git a/doxia-logging-api/pom.xml b/doxia-logging-api/pom.xml
-index 2267734..71ff169 100644
--- a/doxia-logging-api/pom.xml
+++ b/doxia-logging-api/pom.xml
-@@ -37,6 +37,7 @@ under the License.
+@@ -38,6 +38,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -18,4 +16,3 @@ index 2267734..71ff169 100644
</dependency>
</dependencies>
</project>
---
diff --git a/debian/patches/0003-switch-to-plexus-component-metadata.patch b/debian/patches/0003-switch-to-plexus-component-metadata.patch
index b244e35..1a8755a 100644
--- a/debian/patches/0003-switch-to-plexus-component-metadata.patch
+++ b/debian/patches/0003-switch-to-plexus-component-metadata.patch
@@ -12,11 +12,9 @@ plexus-component-metadata.
pom.xml | 9 ++++-----
5 files changed, 17 insertions(+), 30 deletions(-)
-diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
-index 010c559..a652578 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
-@@ -49,21 +49,18 @@ under the License.
+@@ -53,21 +53,18 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -43,11 +41,9 @@ index 010c559..a652578 100644
-</project>
\ No newline at end of file
+</project>
-diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
-index 64f671a..a3bf3b2 100644
--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
-@@ -45,17 +45,14 @@ under the License.
+@@ -49,17 +49,14 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -68,11 +64,9 @@ index 64f671a..a3bf3b2 100644
</goals>
</execution>
</executions>
-diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
-index 2afafe8..2a4b94f 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
-@@ -77,17 +77,14 @@ under the License.
+@@ -81,17 +81,14 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -93,11 +87,9 @@ index 2afafe8..2a4b94f 100644
</goals>
</execution>
</executions>
-diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
-index f393ef8..947d1e2 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
-@@ -68,17 +68,14 @@ under the License.
+@@ -72,17 +72,14 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -118,12 +110,10 @@ index f393ef8..947d1e2 100644
</goals>
</execution>
</executions>
-diff --git a/pom.xml b/pom.xml
-index 5f9dee3..160e2d4 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -271,9 +271,8 @@ under the License.
- <!-- TODO need to upgrade to last version or Maven parent version -->
+@@ -285,9 +285,8 @@
+ </plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
@@ -134,7 +124,7 @@ index 5f9dee3..160e2d4 100644
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
-@@ -328,11 +327,11 @@ under the License.
+@@ -333,11 +332,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -148,4 +138,3 @@ index 5f9dee3..160e2d4 100644
</goals>
</execution>
</executions>
---
diff --git a/debian/patches/0007-disable-plexus-javadoc.patch b/debian/patches/0007-disable-plexus-javadoc.patch
index 3412e3b..8467a67 100644
--- a/debian/patches/0007-disable-plexus-javadoc.patch
+++ b/debian/patches/0007-disable-plexus-javadoc.patch
@@ -7,22 +7,19 @@ It has some unresolved dependency.
pom.xml | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
-diff --git a/pom.xml b/pom.xml
-index 22ad945..d18ba78 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -306,13 +306,6 @@ under the License.
+@@ -312,13 +312,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>
---
diff --git a/debian/patches/0008-fop2-compatibility.patch b/debian/patches/0008-fop2-compatibility.patch
index e560190..c0f695e 100644
--- a/debian/patches/0008-fop2-compatibility.patch
+++ b/debian/patches/0008-fop2-compatibility.patch
@@ -2,7 +2,7 @@ Description: Port to fop-2.0
Author: Michael Simacek <msimacek at redhat.com>
--- a/doxia-modules/doxia-module-fo/pom.xml
+++ b/doxia-modules/doxia-module-fo/pom.xml
-@@ -69,7 +69,7 @@
+@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git
More information about the pkg-java-commits
mailing list