[pkg-java] r15176 - in trunk/surefire/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-10-11 01:13:39 +0000 (Tue, 11 Oct 2011)
New Revision: 15176

Removed:
   trunk/surefire/debian/patches/doxia_1.1.patch
Modified:
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
   trunk/surefire/debian/patches/pom.patch
Log:
* Add Build-Depends on libsurefire-java.
* Add Depends on libmaven-common-artifact-filters-java for binary package.


Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2011-10-10 22:34:18 UTC (rev 15175)
+++ trunk/surefire/debian/changelog	2011-10-11 01:13:39 UTC (rev 15176)
@@ -3,13 +3,14 @@
   * Team upload.
   * New upstream release.
   * Refresh and remove unneccesary patches.
-  * Add Build-Depends on libmaven-common-artifact-filters-java.
+  * Add Build-Depends on libsurefire-java and
+    libmaven-common-artifact-filters-java.
   * Drop outdated Maven artifact surefire-junit.
   * Provide new Maven artifacts: surefire-junit3, maven-surefire-common,
     common-junit3, common-junit4, surefire-junit47 and surefire-testng-utils.
   * Fix clean target to allow "two in a row" builds.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 10 Oct 2011 18:00:08 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 10 Oct 2011 20:42:16 -0430
 
 surefire (2.4.3-5) unstable; urgency=low
 

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2011-10-10 22:34:18 UTC (rev 15175)
+++ trunk/surefire/debian/control	2011-10-11 01:13:39 UTC (rev 15176)
@@ -8,7 +8,8 @@
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-install-plugin-java, 
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java,
  libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
- junit, junit4, testng, libjmock-java, libmaven-common-artifact-filters-java
+ junit, junit4, testng, libjmock-java, libsurefire-java,
+ libmaven-common-artifact-filters-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/surefire/
@@ -16,7 +17,8 @@
 
 Package: libsurefire-java
 Architecture: all
-Depends: ${misc:Depends}, junit, junit4, testng, libjmock-java
+Depends: ${misc:Depends}, junit, junit4, testng, libjmock-java,
+ libmaven-common-artifact-filters-java
 Description: Surefire test framework for Java
  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,

Deleted: trunk/surefire/debian/patches/doxia_1.1.patch
===================================================================
--- trunk/surefire/debian/patches/doxia_1.1.patch	2011-10-10 22:34:18 UTC (rev 15175)
+++ trunk/surefire/debian/patches/doxia_1.1.patch	2011-10-11 01:13:39 UTC (rev 15176)
@@ -1,45 +0,0 @@
---- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
-+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
-@@ -30,7 +30,7 @@
- import org.apache.maven.project.MavenProject;
- import org.apache.maven.reporting.AbstractMavenReport;
- import org.apache.maven.reporting.MavenReportException;
--import org.codehaus.doxia.site.renderer.SiteRenderer;
-+import org.apache.maven.doxia.siterenderer.Renderer;
- import org.codehaus.plexus.util.PathTool;
- import org.codehaus.plexus.util.StringUtils;
- 
-@@ -56,10 +56,10 @@
-     /**
-      * Doxia Site Renderer
-      *
--     * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
-+     * @parameter expression="${component.org.apache.maven.doxia.siterenderer.Renderer}"
-      * @required @readonly
-      */
--    private SiteRenderer siteRenderer;
-+    private Renderer siteRenderer;
- 
-     /**
-      * Maven Project
-@@ -230,7 +230,7 @@
-         return getBundle( locale ).getString( "report.surefire.description" );
-     }
- 
--    protected SiteRenderer getSiteRenderer()
-+    protected Renderer getSiteRenderer()
-     {
-         return siteRenderer;
-     }
---- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
-+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
-@@ -20,8 +20,7 @@
-  */
- 
- import org.apache.maven.reporting.MavenReportException;
--import org.codehaus.doxia.sink.Sink;
--
-+import org.apache.maven.doxia.sink.Sink;
- import java.io.File;
- import java.text.NumberFormat;
- import java.util.Iterator;

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2011-10-10 22:34:18 UTC (rev 15175)
+++ trunk/surefire/debian/patches/pom.patch	2011-10-11 01:13:39 UTC (rev 15176)
@@ -47,19 +47,3 @@
  
    <profiles>
      <!-- use preinstalled JDK 1.3 to build and test -->
---- surefire-2.10.orig/maven-surefire-plugin/pom.xml
-+++ surefire-2.10/maven-surefire-plugin/pom.xml
-@@ -140,10 +140,13 @@
-       <groupId>org.apache.maven.surefire</groupId>
-       <artifactId>surefire-booter</artifactId>
-     </dependency>
-+    <!-- surefire 2.4.3 is too outdated to provide this artifact,
-+         so the package can't Build-Depends on itself yet
-     <dependency>
-       <groupId>org.apache.maven.surefire</groupId>
-       <artifactId>maven-surefire-common</artifactId>
-     </dependency>
-+    -->
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>