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 06cc182ecec9cf41bf9e43b7f3e5f93607e6a9c7 Author: Ludovic Claude <[email protected]> Date: Wed Aug 5 20:28:00 2009 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/README.source | 9 +++++ debian/changelog | 5 +++ debian/compat | 1 + debian/control | 38 +++++++++++++++++++ debian/copyright | 22 +++++++++++ debian/libmaven-javadoc-plugin-java.poms | 1 + debian/maven.properties | 1 + debian/maven.rules | 6 +++ debian/orig-tar.sh | 16 ++++++++ debian/patches/descriptor.patch | 64 ++++++++++++++++++++++++++++++++ debian/patches/doxia1_1.patch | 11 ++++++ debian/patches/series | 2 + debian/rules | 10 +++++ debian/watch | 4 ++ 14 files changed, 190 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..8c4cd39 --- /dev/null +++ b/debian/README.source @@ -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. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0cd3641 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +maven-javadoc-plugin (2.5-0ubuntu1~ppa8) karmic; urgency=low + + * Initial release (Closes: #540051) + + -- Ludovic Claude <[email protected]> Wed, 01 Jul 2009 15:33:46 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..dd32efc --- /dev/null +++ b/debian/control @@ -0,0 +1,38 @@ +Source: maven-javadoc-plugin +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Ludovic Claude <[email protected]> +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. + + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9117459 --- /dev/null +++ b/debian/copyright @@ -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 <[email protected]> +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'. + + diff --git a/debian/libmaven-javadoc-plugin-java.poms b/debian/libmaven-javadoc-plugin-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libmaven-javadoc-plugin-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..d2f1b82 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1 @@ +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..ee6bdd9 --- /dev/null +++ b/debian/maven.rules @@ -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/ + diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100644 index 0000000..d136f6b --- /dev/null +++ b/debian/orig-tar.sh @@ -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 diff --git a/debian/patches/descriptor.patch b/debian/patches/descriptor.patch new file mode 100644 index 0000000..b5d0750 --- /dev/null +++ b/debian/patches/descriptor.patch @@ -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; diff --git a/debian/patches/doxia1_1.patch b/debian/patches/doxia1_1.patch new file mode 100644 index 0000000..89eb7bd --- /dev/null +++ b/debian/patches/doxia1_1.patch @@ -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; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..937cf8e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +descriptor.patch +doxia1_1.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..dd3501d --- /dev/null +++ b/debian/rules @@ -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 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..180f9e4 --- /dev/null +++ b/debian/watch @@ -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 -- 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
