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 c9af8a0c0152ca3503dc8499c56502ece99b8df6 Author: Emmanuel Bourg <[email protected]> Date: Tue Nov 5 16:48:09 2013 +0000 New upstream release (2.9.1) Refreshed doxia1_1.patch Added a patch fixing the unmappable characters errors Added a patch to remain compatible with the version of plexus-utils in Debian debian/control: Updated Standards-Version to 3.9.5 (no changes) --- debian/changelog | 12 ++++++++++ debian/control | 5 ++-- debian/libmaven-javadoc-plugin-java.poms | 29 +++++++++++++++++++++++- debian/maven.ignoreRules | 9 ++++---- debian/maven.properties | 3 +++ debian/patches/doxia1_1.patch | 6 ++--- debian/patches/fix-unmappable-characters.patch | 14 ++++++++++++ debian/patches/plexus-utils2-compatibility.patch | 16 +++++++++++++ debian/patches/series | 2 ++ 9 files changed, 86 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4fd6d1a..2e58505 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +maven-javadoc-plugin (2.9.1-1) unstable; urgency=low + + * Team upload. + * New upstream release + - Refreshed doxia1_1.patch + - Added a patch fixing the unmappable characters errors + - Added a patch to remain compatible with the version of plexus-utils + in Debian + * debian/control: Updated Standards-Version to 3.9.5 (no changes) + + -- Emmanuel Bourg <[email protected]> Tue, 05 Nov 2013 16:49:04 +0100 + maven-javadoc-plugin (2.8-1) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index cc75975..0aa11e4 100644 --- a/debian/control +++ b/debian/control @@ -9,17 +9,18 @@ Build-Depends-Indep: clirr, libcommons-lang-java, libdoxia-java, libdoxia-sitetools-java, + libhttpclient-java, liblog4j1.2-java, libmaven-archiver-java, libmaven-invoker-plugin-java (>= 1.3), libmaven-plugin-testing-java, - libmaven-plugin-tools-java (>= 2.8), + libmaven-plugin-tools-java (>= 3.2), libmaven-shade-plugin-java, libmaven2-core-java, libmodello-maven-plugin-java (>= 1.1), libqdox-java, libwagon-java -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-javadoc-plugin Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-javadoc-plugin/ Homepage: http://maven.apache.org/plugins/maven-javadoc-plugin/ diff --git a/debian/libmaven-javadoc-plugin-java.poms b/debian/libmaven-javadoc-plugin-java.poms index 43e746b..5ad70f2 100644 --- a/debian/libmaven-javadoc-plugin-java.poms +++ b/debian/libmaven-javadoc-plugin-java.poms @@ -1 +1,28 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 6975002..2f523da 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,4 +1,5 @@ -org.apache.maven.plugins maven-enforcer-plugin maven-plugin * -org.mortbay.jetty jetty jar * -org.mortbay.jetty jetty-client jar * -junit-addons junit-addons jar * + +junit-addons junit-addons jar * * * +org.apache.maven.plugins maven-enforcer-plugin maven-plugin * * * +org.mortbay.jetty jetty-client jar * * * +org.mortbay.jetty jetty jar * * * diff --git a/debian/maven.properties b/debian/maven.properties index d2f1b82..2fd2111 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1 +1,4 @@ maven.test.skip=true +maven.compiler.source=1.6 +maven.compiler.target=1.6 +project.build.sourceEncoding=UTF-8 diff --git a/debian/patches/doxia1_1.patch b/debian/patches/doxia1_1.patch index 89eb7bd..eecf8ce 100644 --- a/debian/patches/doxia1_1.patch +++ b/debian/patches/doxia1_1.patch @@ -1,8 +1,8 @@ --- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java +++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java -@@ -24,7 +24,7 @@ - import java.util.Locale; - import java.util.ResourceBundle; +@@ -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; diff --git a/debian/patches/fix-unmappable-characters.patch b/debian/patches/fix-unmappable-characters.patch new file mode 100644 index 0000000..9877b23 --- /dev/null +++ b/debian/patches/fix-unmappable-characters.patch @@ -0,0 +1,14 @@ +Description: Fix compilation errors caused by unmappable characters for encoding ASCII +Author: Emmanuel Bourg <[email protected]> +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 @@ + * </tr> + * <tr> + * <td>IBM 1.5 (French JVM)</td> +- * <td>javadoc version complète de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> ++ * <td>javadoc version complete de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> + * </tr> + * <tr> + * <td>FreeBSD 1.5</td> diff --git a/debian/patches/plexus-utils2-compatibility.patch b/debian/patches/plexus-utils2-compatibility.patch new file mode 100644 index 0000000..e10919f --- /dev/null +++ b/debian/patches/plexus-utils2-compatibility.patch @@ -0,0 +1,16 @@ +Description: FileUtils.fileWrite(File, String, String) was introduced in + plexus-utils 2.0.6 but this version isn't available in Debian yet. So we fall + back to FileUtils.fileWrite(String, String, String) +Author: Emmanuel Bourg <[email protected]> +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 @@ + StringUtils.replaceOnce( fileContents, "function loadFrames() {", fixData ); + if ( !patchedFileContents.equals( fileContents ) ) + { +- FileUtils.fileWrite( file, outputEncoding, patchedFileContents ); ++ FileUtils.fileWrite( file.getAbsolutePath(), outputEncoding, patchedFileContents ); + patched++; + } + } diff --git a/debian/patches/series b/debian/patches/series index 67c2eed..6ee6e9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ doxia1_1.patch +plexus-utils2-compatibility.patch +fix-unmappable-characters.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
