This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-site-plugin.
commit 04e459e2301b226393413a7d9573e83f45e8adbf Author: Gabriele Giacone <[email protected]> Date: Fri Feb 26 01:17:44 2010 +0000 new upstream release 2.1 --- debian/README.source | 8 -------- debian/changelog | 8 ++++---- debian/control | 11 ++++++----- debian/patches/doxia1.1.patch | 33 --------------------------------- debian/patches/series | 1 - debian/rules | 12 +++++++----- 6 files changed, 17 insertions(+), 56 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 15f8be5..0000000 --- a/debian/README.source +++ /dev/null @@ -1,8 +0,0 @@ -Patch System -============ - -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. diff --git a/debian/changelog b/debian/changelog index bf1d42a..9e85287 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,17 @@ -maven-site-plugin (2.0-3) unstable; urgency=low +maven-site-plugin (2.1-1) unstable; urgency=low [ Michael Koch ] - * New upstream release. - * Added debian/README.source. * Added myself to Uploaders. [ Gabriele Giacone ] + * New upstream release. * Moved libjetty-java from Suggests to Depends as it's a maven compile dependency + * Removed doxia1.1 patch * Updated Standards-Version to 3.8.4. * Source format 3.0 (quilt) - -- Gabriele Giacone <[email protected]> Wed, 24 Feb 2010 03:01:42 +0100 + -- Gabriele Giacone <[email protected]> Fri, 26 Feb 2010 02:08:09 +0100 maven-site-plugin (2.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index f27c143..d5b44ba 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,12 @@ Source: maven-site-plugin Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk, quilt, maven-ant-helper (>> 4), ant-optional -Build-Depends-Indep: maven-repo-helper, - junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity, - libmaven-doxia-tools-java, libjetty-java +Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, + Michael Koch <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk, quilt, + maven-ant-helper (>> 4), ant-optional +Build-Depends-Indep: maven-repo-helper, junit, libmaven-plugin-tools-java, + libplexus-velocity-java, velocity, libmaven-doxia-tools-java, libjetty-java Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-site-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-site-plugin/ diff --git a/debian/patches/doxia1.1.patch b/debian/patches/doxia1.1.patch deleted file mode 100644 index 68ff211..0000000 --- a/debian/patches/doxia1.1.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java -+++ b/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java -@@ -21,7 +21,7 @@ - - import org.apache.maven.artifact.factory.ArtifactFactory; - import org.apache.maven.artifact.resolver.ArtifactResolver; --import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; -+import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.DecorationModel; - import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler; - import org.apache.maven.doxia.siterenderer.DocumentRenderer; ---- a/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java -+++ b/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.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.DocumentRenderer; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; ---- a/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java -+++ b/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.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.sink.Sink; - import org.apache.maven.doxia.sink.SinkFactory; - import org.apache.maven.doxia.siterenderer.DocumentRenderer; diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 36510dd..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -doxia1.1.patch diff --git a/debian/rules b/debian/rules index f5f38ab..d376d9d 100755 --- a/debian/rules +++ b/debian/rules @@ -7,11 +7,13 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-project maven-artifact maven-artifact-manager \ - maven-settings maven-reporting-api maven-doxia-tools doxia-core doxia-logging-api doxia-sink-api doxia-module-xhtml \ - doxia-decoration-model doxia-site-renderer wagon-provider-api plexus-archiver plexus-container-default-alpha \ - plexus-i18n plexus-utils jetty jetty-util jetty-util5 commons-lang servlet-api-2.5 \ - classworlds +DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api \ + maven-project maven-artifact maven-artifact-manager maven-settings \ + maven-reporting-api maven-doxia-tools doxia-core doxia-logging-api \ + doxia-sink-api doxia-module-xhtml doxia-decoration-model doxia-module-xdoc \ + doxia-site-renderer wagon-provider-api plexus-archiver \ + plexus-container-default-alpha plexus-i18n plexus-utils jetty jetty-util \ + jetty-util5 commons-lang servlet-api-2.5 classworlds DEB_ANT_BUILD_TARGET := package #javadoc DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
