This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit 535d2fbcb4b29c8e0b6666ce4909378fb46ca93d Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 21:13:57 2017 +0200 Refreshed the patches --- debian/changelog | 2 +- debian/patches/0001-modello.patch | 15 +-- ...2-add-version-to-plexus-container-default.patch | 2 +- .../0003-switch-to-plexus-component-metadata.patch | 140 --------------------- debian/patches/0008-fop2-compatibility.patch | 2 +- debian/patches/series | 1 - 6 files changed, 5 insertions(+), 157 deletions(-) diff --git a/debian/changelog b/debian/changelog index efcce82..c1a1879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -doxia (1.3-1) UNRELEASED; urgency=medium +doxia (1.4-1) UNRELEASED; urgency=medium * Team upload. * New upstream release diff --git a/debian/patches/0001-modello.patch b/debian/patches/0001-modello.patch index 24350a6..1d1bf6c 100644 --- a/debian/patches/0001-modello.patch +++ b/debian/patches/0001-modello.patch @@ -81,20 +81,9 @@ Subject: modello } ]]> </code> ---- 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 -@@ -1214,7 +1214,7 @@ - att.addAttribute( "height", "0.3in" ); - att.addAttribute( "text-align", "left" ); - writeStartTag( BLOCK_TAG, att ); -- write( compName == null ? ( cover.getAuthor() == null ? "" : cover.getAuthor() ) : compName ); -+ write( compName == null ? ( cover.getAllAuthorNames() == null ? "" : cover.getAllAuthorNames() ) : compName ); - writeEndTag( BLOCK_TAG ); - writeEndTag( TABLE_CELL_TAG ); - --- a/doxia-core/pom.xml +++ b/doxia-core/pom.xml -@@ -123,6 +123,7 @@ +@@ -126,6 +126,7 @@ <models> <model>src/main/mdo/document.mdo</model> </models> @@ -104,7 +93,7 @@ Subject: modello </plugins> --- a/doxia-modules/doxia-module-fml/pom.xml +++ b/doxia-modules/doxia-module-fml/pom.xml -@@ -75,6 +75,7 @@ +@@ -74,6 +74,7 @@ <model>src/main/mdo/fml.mdo</model> </models> <version>1.0.0</version> 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 0a508fa..76a352e 100644 --- a/debian/patches/0002-add-version-to-plexus-container-default.patch +++ b/debian/patches/0002-add-version-to-plexus-container-default.patch @@ -8,7 +8,7 @@ Subject: add version to plexus-container-default --- a/doxia-logging-api/pom.xml +++ b/doxia-logging-api/pom.xml -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> diff --git a/debian/patches/0003-switch-to-plexus-component-metadata.patch b/debian/patches/0003-switch-to-plexus-component-metadata.patch deleted file mode 100644 index 69703e6..0000000 --- a/debian/patches/0003-switch-to-plexus-component-metadata.patch +++ /dev/null @@ -1,140 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sat, 10 Sep 2011 00:06:13 +0200 -Subject: switch to plexus-component-metadata - -The old plexus-maven-plugin fails in merge-descriptors and has been replaced by -plexus-component-metadata. ---- - doxia-modules/doxia-module-apt/pom.xml | 11 ++++------- - doxia-modules/doxia-module-docbook-simple/pom.xml | 9 +++------ - doxia-modules/doxia-module-fml/pom.xml | 9 +++------ - doxia-modules/doxia-module-xdoc/pom.xml | 9 +++------ - pom.xml | 9 ++++----- - 5 files changed, 17 insertions(+), 30 deletions(-) - ---- a/doxia-modules/doxia-module-apt/pom.xml -+++ b/doxia-modules/doxia-module-apt/pom.xml -@@ -53,21 +53,18 @@ - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> --</project> -\ No newline at end of file -+</project> ---- a/doxia-modules/doxia-module-docbook-simple/pom.xml -+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml -@@ -49,17 +49,14 @@ - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> ---- a/doxia-modules/doxia-module-fml/pom.xml -+++ b/doxia-modules/doxia-module-fml/pom.xml -@@ -81,17 +81,14 @@ - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> ---- a/doxia-modules/doxia-module-xdoc/pom.xml -+++ b/doxia-modules/doxia-module-xdoc/pom.xml -@@ -72,17 +72,14 @@ - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <configuration> -- <descriptors> -- <descriptor>src/main/components/components.xml</descriptor> -- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> -- </descriptors> -+ <staticMetadataDirectory>${basedir}/src/main/components/components.xml</staticMetadataDirectory> - </configuration> - <executions> - <execution> - <goals> -- <goal>merge-descriptors</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> ---- a/pom.xml -+++ b/pom.xml -@@ -322,9 +322,8 @@ - </plugin> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -- <!-- Version 1.3.8 makes the descriptor merges fail, probably due to PLX-409 --> -- <version>1.3.5</version> -+ <artifactId>plexus-component-metadata</artifactId> -+ <version>1.5.5</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> -@@ -341,11 +340,11 @@ - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> -- <artifactId>plexus-maven-plugin</artifactId> -+ <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> -- <goal>descriptor</goal> -+ <goal>generate-metadata</goal> - </goals> - </execution> - </executions> diff --git a/debian/patches/0008-fop2-compatibility.patch b/debian/patches/0008-fop2-compatibility.patch index c0f695e..0cecb80 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 <[email protected]> --- a/doxia-modules/doxia-module-fo/pom.xml +++ b/doxia-modules/doxia-module-fo/pom.xml -@@ -73,7 +73,7 @@ +@@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> diff --git a/debian/patches/series b/debian/patches/series index ec26a01..ceebdf3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-modello.patch 0002-add-version-to-plexus-container-default.patch -0003-switch-to-plexus-component-metadata.patch 0008-fop2-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
