[pkg-java] r14434 - in trunk/maven-reporting-impl/debian: . patches source

[Torsten Werner]

Author: twerner
Date: 2011-08-23 21:35:52 +0000 (Tue, 23 Aug 2011)
New Revision: 14434

Added:
   trunk/maven-reporting-impl/debian/patches/0001-support-doxia-1.1.patch
   trunk/maven-reporting-impl/debian/source/
   trunk/maven-reporting-impl/debian/source/format
Removed:
   trunk/maven-reporting-impl/debian/patches/doxia1_1.patch
Modified:
   trunk/maven-reporting-impl/debian/changelog
   trunk/maven-reporting-impl/debian/control
   trunk/maven-reporting-impl/debian/patches/series
   trunk/maven-reporting-impl/debian/rules
Log:
* New upstream release.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.
* Refresh patch.

Modified: trunk/maven-reporting-impl/debian/changelog
===================================================================
--- trunk/maven-reporting-impl/debian/changelog	2011-08-23 21:21:33 UTC (rev 14433)
+++ trunk/maven-reporting-impl/debian/changelog	2011-08-23 21:35:52 UTC (rev 14434)
@@ -1,3 +1,12 @@
+maven-reporting-impl (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update Standards-Version: 3.9.1.
+  * Switch to source format 3.0.
+  * Refresh patch.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 23 Aug 2011 23:34:59 +0200
+
 maven-reporting-impl (2.0.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/maven-reporting-impl/debian/control
===================================================================
--- trunk/maven-reporting-impl/debian/control	2011-08-23 21:21:33 UTC (rev 14433)
+++ trunk/maven-reporting-impl/debian/control	2011-08-23 21:35:52 UTC (rev 14434)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
  libmaven2-core-java, libdoxia-java, libcommons-validator-java, 
  libplexus-utils-java, libdoxia-sitetools-java
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-reporting-impl
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-reporting-impl
 Homepage: http://maven.apache.org/shared/maven-reporting-impl/

Added: trunk/maven-reporting-impl/debian/patches/0001-support-doxia-1.1.patch
===================================================================
--- trunk/maven-reporting-impl/debian/patches/0001-support-doxia-1.1.patch	                        (rev 0)
+++ trunk/maven-reporting-impl/debian/patches/0001-support-doxia-1.1.patch	2011-08-23 21:35:52 UTC (rev 14434)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 23 Aug 2011 23:30:58 +0200
+Subject: [PATCH] support doxia 1.1
+
+---
+ .../apache/maven/reporting/sink/SinkFactory.java   |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
+index 2a51f13..dd716c5 100644
+--- a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
++++ b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
+@@ -19,7 +19,7 @@ package org.apache.maven.reporting.sink;
+  * 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.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
+-- 

Deleted: trunk/maven-reporting-impl/debian/patches/doxia1_1.patch
===================================================================
--- trunk/maven-reporting-impl/debian/patches/doxia1_1.patch	2011-08-23 21:21:33 UTC (rev 14433)
+++ trunk/maven-reporting-impl/debian/patches/doxia1_1.patch	2011-08-23 21:35:52 UTC (rev 14434)
@@ -1,11 +0,0 @@
---- a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
-+++ b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
-@@ -16,7 +16,7 @@
-  * limitations 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.siterenderer.Renderer;
- import org.apache.maven.doxia.siterenderer.RendererException;

Modified: trunk/maven-reporting-impl/debian/patches/series
===================================================================
--- trunk/maven-reporting-impl/debian/patches/series	2011-08-23 21:21:33 UTC (rev 14433)
+++ trunk/maven-reporting-impl/debian/patches/series	2011-08-23 21:35:52 UTC (rev 14434)
@@ -1 +1 @@
-doxia1_1.patch
+0001-support-doxia-1.1.patch

Modified: trunk/maven-reporting-impl/debian/rules
===================================================================
--- trunk/maven-reporting-impl/debian/rules	2011-08-23 21:21:33 UTC (rev 14433)
+++ trunk/maven-reporting-impl/debian/rules	2011-08-23 21:35:52 UTC (rev 14434)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)

Added: trunk/maven-reporting-impl/debian/source/format
===================================================================
--- trunk/maven-reporting-impl/debian/source/format	                        (rev 0)
+++ trunk/maven-reporting-impl/debian/source/format	2011-08-23 21:35:52 UTC (rev 14434)
@@ -0,0 +1 @@
+3.0 (quilt)