[pkg-java] r17430 - in trunk/maven-javadoc-plugin/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Tue Nov 5 16:48:09 UTC 2013


Author: ebourg-guest
Date: 2013-11-05 16:48:09 +0000 (Tue, 05 Nov 2013)
New Revision: 17430

Added:
   trunk/maven-javadoc-plugin/debian/patches/fix-unmappable-characters.patch
   trunk/maven-javadoc-plugin/debian/patches/plexus-utils2-compatibility.patch
Modified:
   trunk/maven-javadoc-plugin/debian/changelog
   trunk/maven-javadoc-plugin/debian/control
   trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms
   trunk/maven-javadoc-plugin/debian/maven.ignoreRules
   trunk/maven-javadoc-plugin/debian/maven.properties
   trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch
   trunk/maven-javadoc-plugin/debian/patches/series
Log:
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)



Modified: trunk/maven-javadoc-plugin/debian/changelog
===================================================================
--- trunk/maven-javadoc-plugin/debian/changelog	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/changelog	2013-11-05 16:48:09 UTC (rev 17430)
@@ -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 <ebourg at apache.org>  Tue, 05 Nov 2013 16:49:04 +0100
+
 maven-javadoc-plugin (2.8-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/maven-javadoc-plugin/debian/control
===================================================================
--- trunk/maven-javadoc-plugin/debian/control	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/control	2013-11-05 16:48:09 UTC (rev 17430)
@@ -9,17 +9,18 @@
                      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/

Modified: trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms
===================================================================
--- trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms	2013-11-05 16:48:09 UTC (rev 17430)
@@ -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

Modified: trunk/maven-javadoc-plugin/debian/maven.ignoreRules
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.ignoreRules	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/maven.ignoreRules	2013-11-05 16:48:09 UTC (rev 17430)
@@ -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 * * *

Modified: trunk/maven-javadoc-plugin/debian/maven.properties
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.properties	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/maven.properties	2013-11-05 16:48:09 UTC (rev 17430)
@@ -1 +1,4 @@
 maven.test.skip=true
+maven.compiler.source=1.6
+maven.compiler.target=1.6
+project.build.sourceEncoding=UTF-8

Modified: trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch	2013-11-05 16:48:09 UTC (rev 17430)
@@ -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;

Added: trunk/maven-javadoc-plugin/debian/patches/fix-unmappable-characters.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/fix-unmappable-characters.patch	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/patches/fix-unmappable-characters.patch	2013-11-05 16:48:09 UTC (rev 17430)
@@ -0,0 +1,14 @@
+Description: Fix compilation errors caused by unmappable characters for encoding ASCII
+Author: Emmanuel Bourg <ebourg at apache.org>
+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>

Added: trunk/maven-javadoc-plugin/debian/patches/plexus-utils2-compatibility.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/plexus-utils2-compatibility.patch	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/patches/plexus-utils2-compatibility.patch	2013-11-05 16:48:09 UTC (rev 17430)
@@ -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 <ebourg at apache.org>
+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++;
+                 }
+             }

Modified: trunk/maven-javadoc-plugin/debian/patches/series
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/series	2013-11-05 15:10:20 UTC (rev 17429)
+++ trunk/maven-javadoc-plugin/debian/patches/series	2013-11-05 16:48:09 UTC (rev 17430)
@@ -1 +1,3 @@
 doxia1_1.patch
+plexus-utils2-compatibility.patch
+fix-unmappable-characters.patch




More information about the pkg-java-commits mailing list