[pkg-java] r17433 - in tags/maven-javadoc-plugin: . 2.9.1-1/debian 2.9.1-1/debian/patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Tue Nov 5 16:53:19 UTC 2013
Author: ebourg-guest
Date: 2013-11-05 16:53:19 +0000 (Tue, 05 Nov 2013)
New Revision: 17433
Added:
tags/maven-javadoc-plugin/2.9.1-1/
tags/maven-javadoc-plugin/2.9.1-1/debian/README.source
tags/maven-javadoc-plugin/2.9.1-1/debian/changelog
tags/maven-javadoc-plugin/2.9.1-1/debian/compat
tags/maven-javadoc-plugin/2.9.1-1/debian/control
tags/maven-javadoc-plugin/2.9.1-1/debian/copyright
tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms
tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules
tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties
tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/fix-unmappable-characters.patch
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/plexus-utils2-compatibility.patch
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series
Removed:
tags/maven-javadoc-plugin/2.9.1-1/debian/README.source
tags/maven-javadoc-plugin/2.9.1-1/debian/changelog
tags/maven-javadoc-plugin/2.9.1-1/debian/compat
tags/maven-javadoc-plugin/2.9.1-1/debian/control
tags/maven-javadoc-plugin/2.9.1-1/debian/copyright
tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms
tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules
tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties
tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch
tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series
Log:
[svn-buildpackage] Tagging maven-javadoc-plugin 2.9.1-1
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/README.source
===================================================================
--- trunk/maven-javadoc-plugin/debian/README.source 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/README.source 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,9 +0,0 @@
-Information about maven-javadoc-plugin
-------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
-The build system uses Maven but prevent it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/README.source (from rev 17346, trunk/maven-javadoc-plugin/debian/README.source)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/README.source (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/README.source 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,16 @@
+Information about maven-javadoc-plugin
+--------------------------------------
+
+This plugin is a core Maven plugin, if you update it to a new upstream release
+the superpom in the maven2-core package must be updated to specify the new
+version of the plugin. This pom is bundled in a jar built by the maven2 package,
+so the maven2 package has to be rebuilt after installing the updated maven2-core
+package.
+
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevent it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/changelog
===================================================================
--- trunk/maven-javadoc-plugin/debian/changelog 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/changelog 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,34 +0,0 @@
-maven-javadoc-plugin (2.6.1-2) unstable; urgency=low
-
- * Team upload.
- * Add Build-Depends on libmaven-plugin-tools-java (>= 2.8) (Closes: #640017).
- * Bump Standards-Version to 3.9.2. No changes were required.
- * Switch to source package format 3.0 (quilt).
-
- -- Miguel Landaeta <miguel at miguel.cc> Thu, 01 Sep 2011 07:40:02 -0430
-
-maven-javadoc-plugin (2.6.1-1) unstable; urgency=low
-
- * New upstream release (Closes: #573575)
- * Add maven-enforcer-plugin to d/maven.ignoreRules since this plugin is still
- waiting in NEW.
- * Add missing Build-Depends: libmaven-shade-plugin-java, liblog4j1.2-java.
- * Add rule for commons-httpclient 3.x and log4j 1.2.x to d/maven.rules.
- * Add test dependencies to d/maven.ignoreRules since we don't build and run
- the tests anyway.
-
- -- Torsten Werner <twerner at debian.org> Fri, 12 Mar 2010 23:56:30 +0100
-
-maven-javadoc-plugin (2.5-2) unstable; urgency=low
-
- * Tightened Depends on libmodello-maven-plugin-doc.
- * Added myself to Uploaders.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 01 Oct 2009 21:46:05 +0200
-
-maven-javadoc-plugin (2.5-1) unstable; urgency=low
-
- * Initial release (Closes: #540051)
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 01 Jul 2009 15:33:46 +0100
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/changelog (from rev 17430, trunk/maven-javadoc-plugin/debian/changelog)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/changelog (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/changelog 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,61 @@
+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.
+ * New upstream release
+ * debian/control:
+ - Updated Standards-Version to 3.9.4 (no changes)
+ - Use canonical URLs for the Vcs-* fields
+ - Removed Michael Koch from the uploaders (Closes: #654112)
+ * debian/copyright: Updated to the Copyright Format 1.0
+ * Build depend on debhelper >= 9
+ * Use XZ compression for the upstream tarball
+ * Documented the procedure to update the core Maven plugins in README.source
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 18 Oct 2013 01:46:27 +0200
+
+maven-javadoc-plugin (2.6.1-2) unstable; urgency=low
+
+ * Team upload.
+ * Add Build-Depends on libmaven-plugin-tools-java (>= 2.8) (Closes: #640017).
+ * Bump Standards-Version to 3.9.2. No changes were required.
+ * Switch to source package format 3.0 (quilt).
+
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 01 Sep 2011 07:40:02 -0430
+
+maven-javadoc-plugin (2.6.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #573575)
+ * Add maven-enforcer-plugin to d/maven.ignoreRules since this plugin is still
+ waiting in NEW.
+ * Add missing Build-Depends: libmaven-shade-plugin-java, liblog4j1.2-java.
+ * Add rule for commons-httpclient 3.x and log4j 1.2.x to d/maven.rules.
+ * Add test dependencies to d/maven.ignoreRules since we don't build and run
+ the tests anyway.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 12 Mar 2010 23:56:30 +0100
+
+maven-javadoc-plugin (2.5-2) unstable; urgency=low
+
+ * Tightened Depends on libmodello-maven-plugin-doc.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 01 Oct 2009 21:46:05 +0200
+
+maven-javadoc-plugin (2.5-1) unstable; urgency=low
+
+ * Initial release (Closes: #540051)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 01 Jul 2009 15:33:46 +0100
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/compat
===================================================================
--- trunk/maven-javadoc-plugin/debian/compat 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/compat 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1 +0,0 @@
-7
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/compat (from rev 17340, trunk/maven-javadoc-plugin/debian/compat)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/compat (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/compat 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1 @@
+9
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/control
===================================================================
--- trunk/maven-javadoc-plugin/debian/control 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/control 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,37 +0,0 @@
-Source: maven-javadoc-plugin
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>> 0.4)
-Build-Depends-Indep: libmaven-invoker-plugin-java (>= 1.3), libmodello-maven-plugin-java (>= 1.1),
- clirr, libbcel-java, libcommons-lang-java, libdoxia-java, libdoxia-sitetools-java,
- libmaven-archiver-java, libmaven2-core-java, libqdox-java, libwagon-java, libmaven-plugin-testing-java,
- libmaven-shade-plugin-java, liblog4j1.2-java, libmaven-plugin-tools-java (>= 2.8)
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-javadoc-plugin
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-javadoc-plugin/
-Homepage: http://maven.apache.org/plugins/maven-javadoc-plugin/
-
-Package: libmaven-javadoc-plugin-java
-Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
-Description: Maven Javadoc Plugin
- Maven is a software project management and comprehension tool. Based on the
- concept of a project object model (POM), Maven can manage a project's build,
- reporting and documentation from a central piece of information.
- .
- Maven's primary goal is to allow a developer to comprehend the complete
- state of a development effort in the shortest period of time. In order to
- attain this goal there are several areas of concern that Maven attempts
- to deal with:
- .
- * Making the build process easy
- * Providing a uniform build system
- * Providing quality project information
- * Providing guidelines for best practices development
- * Allowing transparent migration to new features
- .
- The Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating
- javadocs for the specified project.
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/control (from rev 17430, trunk/maven-javadoc-plugin/debian/control)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/control (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/control 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,49 @@
+Source: maven-javadoc-plugin
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>> 0.4)
+Build-Depends-Indep: clirr,
+ libbcel-java,
+ 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 (>= 3.2),
+ libmaven-shade-plugin-java,
+ libmaven2-core-java,
+ libmodello-maven-plugin-java (>= 1.1),
+ libqdox-java,
+ libwagon-java
+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/
+
+Package: libmaven-javadoc-plugin-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Description: Maven Javadoc Plugin
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+ * Making the build process easy
+ * Providing a uniform build system
+ * Providing quality project information
+ * Providing guidelines for best practices development
+ * Allowing transparent migration to new features
+ .
+ The Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating
+ javadocs for the specified project.
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/copyright
===================================================================
--- trunk/maven-javadoc-plugin/debian/copyright 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/copyright 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,22 +0,0 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Maven Javadoc Plugin
-Maintainer: Apache Maven team
-Source: http://maven.apache.org/
-
-Files: *
-Copyright: 2001-2009, The Apache Software Foundation.
-License: Apache-2.0
-
-Files: debian/*
-Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
-License: GPL-3+
-
-License: GPL-3
- On Debian GNU/Linux system you can find the complete text of the
- GPL-3 license in '/usr/share/common-licenses/GPL-3'
-
-License: Apache-2.0
- On Debian GNU/Linux system you can find the complete text of the
- Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
-
-
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/copyright (from rev 17340, trunk/maven-javadoc-plugin/debian/copyright)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/copyright (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/copyright 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,20 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Maven Javadoc Plugin
+Upstream-Contact: Apache Maven team
+Source: http://maven.apache.org
+
+Files: *
+Copyright: 2001-2009, The Apache Software Foundation.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
+License: GPL-3+
+
+License: GPL-3+
+ On Debian GNU/Linux system you can find the complete text of the
+ GPL-3 license in '/usr/share/common-licenses/GPL-3'
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms
===================================================================
--- trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1 +0,0 @@
-pom.xml --no-parent
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms (from rev 17430, trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/libmaven-javadoc-plugin-java.poms 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,28 @@
+# 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
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.ignoreRules 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,4 +0,0 @@
-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 *
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules (from rev 17430, trunk/maven-javadoc-plugin/debian/maven.ignoreRules)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/maven.ignoreRules 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,5 @@
+
+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 * * *
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.properties 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1 +0,0 @@
-maven.test.skip=true
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties (from rev 17430, trunk/maven-javadoc-plugin/debian/maven.properties)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/maven.properties 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,4 @@
+maven.test.skip=true
+maven.compiler.source=1.6
+maven.compiler.target=1.6
+project.build.sourceEncoding=UTF-8
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh
===================================================================
--- trunk/maven-javadoc-plugin/debian/orig-tar.sh 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-javadoc-plugin_$VERSION.orig.tar.gz
-DIR=maven-javadoc-plugin-$VERSION
-TAG=$(echo "maven-javadoc-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG} $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh (from rev 17343, trunk/maven-javadoc-plugin/debian/orig-tar.sh)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/orig-tar.sh 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../maven-javadoc-plugin_$VERSION.orig.tar.xz
+DIR=maven-javadoc-plugin-$VERSION
+TAG=$(echo "maven-javadoc-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+
+svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG} $DIR
+XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1,11 +0,0 @@
---- 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;
-
--import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-+import org.apache.maven.doxia.sink.render.RenderingContext;
- import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
- import org.apache.maven.plugin.MojoExecutionException;
- import org.apache.maven.plugin.MojoFailureException;
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch (from rev 17430, trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/doxia1_1.patch 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,11 @@
+--- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
++++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
+@@ -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;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.MojoExecutionException;
+ import org.apache.maven.plugin.MojoFailureException;
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/fix-unmappable-characters.patch (from rev 17430, trunk/maven-javadoc-plugin/debian/patches/fix-unmappable-characters.patch)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/patches/fix-unmappable-characters.patch (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/fix-unmappable-characters.patch 2013-11-05 16:53:19 UTC (rev 17433)
@@ -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>
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/plexus-utils2-compatibility.patch (from rev 17430, trunk/maven-javadoc-plugin/debian/patches/plexus-utils2-compatibility.patch)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/patches/plexus-utils2-compatibility.patch (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/plexus-utils2-compatibility.patch 2013-11-05 16:53:19 UTC (rev 17433)
@@ -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++;
+ }
+ }
Deleted: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/series 2013-10-17 23:11:20 UTC (rev 17339)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series 2013-11-05 16:53:19 UTC (rev 17433)
@@ -1 +0,0 @@
-doxia1_1.patch
Copied: tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series (from rev 17430, trunk/maven-javadoc-plugin/debian/patches/series)
===================================================================
--- tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series (rev 0)
+++ tags/maven-javadoc-plugin/2.9.1-1/debian/patches/series 2013-11-05 16:53:19 UTC (rev 17433)
@@ -0,0 +1,3 @@
+doxia1_1.patch
+plexus-utils2-compatibility.patch
+fix-unmappable-characters.patch
More information about the pkg-java-commits
mailing list