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

Ludovic Claude ludovicc-guest at alioth.debian.org
Wed Aug 5 20:28:01 UTC 2009


Author: ludovicc-guest
Date: 2009-08-05 20:28:00 +0000 (Wed, 05 Aug 2009)
New Revision: 9670

Added:
   trunk/maven-javadoc-plugin/debian/
   trunk/maven-javadoc-plugin/debian/README.source
   trunk/maven-javadoc-plugin/debian/changelog
   trunk/maven-javadoc-plugin/debian/compat
   trunk/maven-javadoc-plugin/debian/control
   trunk/maven-javadoc-plugin/debian/copyright
   trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms
   trunk/maven-javadoc-plugin/debian/maven.properties
   trunk/maven-javadoc-plugin/debian/maven.rules
   trunk/maven-javadoc-plugin/debian/orig-tar.sh
   trunk/maven-javadoc-plugin/debian/patches/
   trunk/maven-javadoc-plugin/debian/patches/descriptor.patch
   trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch
   trunk/maven-javadoc-plugin/debian/patches/series
   trunk/maven-javadoc-plugin/debian/rules
   trunk/maven-javadoc-plugin/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: trunk/maven-javadoc-plugin/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/maven-javadoc-plugin/debian/README.source
===================================================================
--- trunk/maven-javadoc-plugin/debian/README.source	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/README.source	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,9 @@
+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.

Added: trunk/maven-javadoc-plugin/debian/changelog
===================================================================
--- trunk/maven-javadoc-plugin/debian/changelog	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/changelog	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,5 @@
+maven-javadoc-plugin (2.5-0ubuntu1~ppa8) karmic; urgency=low
+
+  * Initial release (Closes: #540051)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 01 Jul 2009 15:33:46 +0100

Added: trunk/maven-javadoc-plugin/debian/compat
===================================================================
--- trunk/maven-javadoc-plugin/debian/compat	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/compat	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1 @@
+7

Added: trunk/maven-javadoc-plugin/debian/control
===================================================================
--- trunk/maven-javadoc-plugin/debian/control	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/control	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,38 @@
+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: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt
+Build-Depends-Indep: libmaven-invoker-plugin-java (>= 1.3), libmodello-maven-plugin-java (>= 1.0.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
+Standards-Version: 3.8.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.
+
+

Added: trunk/maven-javadoc-plugin/debian/copyright
===================================================================
--- trunk/maven-javadoc-plugin/debian/copyright	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/copyright	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,22 @@
+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: 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'.
+
+

Added: trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms
===================================================================
--- trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/libmaven-javadoc-plugin-java.poms	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/maven-javadoc-plugin/debian/maven.properties
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.properties	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/maven.properties	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1 @@
+maven.test.skip=true

Added: trunk/maven-javadoc-plugin/debian/maven.rules
===================================================================
--- trunk/maven-javadoc-plugin/debian/maven.rules	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/maven.rules	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,6 @@
+org.codehaus.modello modello-maven-plugin maven-plugin s/.*/1.0.1/
+org.codehaus.mojo clirr-maven-plugin * *
+org.apache.bcel bcel jar s/5\..*/5.x/
+* maven-plugin-plugin maven-plugin s/.*/2.5/
+junit junit jar s/3\..*/3.x/
+

Added: trunk/maven-javadoc-plugin/debian/orig-tar.sh
===================================================================
--- trunk/maven-javadoc-plugin/debian/orig-tar.sh	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/orig-tar.sh	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,16 @@
+#!/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

Added: trunk/maven-javadoc-plugin/debian/patches/descriptor.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/descriptor.patch	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/patches/descriptor.patch	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,64 @@
+--- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
++++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
+@@ -170,14 +170,14 @@
+      * Archiver manager
+      *
+      * @since 2.5
+-     * @component
++     * @component role="org.codehaus.plexus.archiver.manager.ArchiverManager"
+      */
+     private ArchiverManager archiverManager;
+ 
+     /**
+      * Factory for creating artifact objects
+      *
+-     * @component
++     * @component role="org.apache.maven.artifact.factory.ArtifactFactory"
+      */
+     private ArtifactFactory factory;
+ 
+@@ -185,14 +185,14 @@
+      * Used to resolve artifacts of aggregated modules
+      *
+      * @since 2.1
+-     * @component
++     * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
+      */
+     private ArtifactMetadataSource artifactMetadataSource;
+ 
+     /**
+      * Used for resolving artifacts
+      *
+-     * @component
++     * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
+      */
+     private ArtifactResolver resolver;
+ 
+@@ -200,7 +200,7 @@
+      * Project builder
+      *
+      * @since 2.5
+-     * @component
++     * @component role="org.apache.maven.project.MavenProjectBuilder"
+      */
+     private MavenProjectBuilder mavenProjectBuilder;
+ 
+--- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
++++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
+@@ -73,14 +73,14 @@
+     /**
+      * Used for attaching the artifact in the project.
+      *
+-     * @component
++     * @component role="org.apache.maven.project.MavenProjectBuilder"
+      */
+     private MavenProjectHelper projectHelper;
+ 
+     /**
+      * The Jar archiver.
+      *
+-     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
++     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
+      * @since 2.5
+      */
+     private JarArchiver jarArchiver;

Added: trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/patches/doxia1_1.patch	2009-08-05 20:28:00 UTC (rev 9670)
@@ -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
+@@ -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;

Added: trunk/maven-javadoc-plugin/debian/patches/series
===================================================================
--- trunk/maven-javadoc-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/patches/series	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,2 @@
+descriptor.patch
+doxia1_1.patch

Added: trunk/maven-javadoc-plugin/debian/rules
===================================================================
--- trunk/maven-javadoc-plugin/debian/rules	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/rules	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename


Property changes on: trunk/maven-javadoc-plugin/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/maven-javadoc-plugin/debian/watch
===================================================================
--- trunk/maven-javadoc-plugin/debian/watch	                        (rev 0)
+++ trunk/maven-javadoc-plugin/debian/watch	2009-08-05 20:28:00 UTC (rev 9670)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+  http://svn.apache.org/repos/asf/maven/plugins/tags/ \
+  maven-javadoc-plugin-(\d.*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list