[pkg-java] r15662 - trunk/surefire/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2012-01-08 02:22:42 +0000 (Sun, 08 Jan 2012)
New Revision: 15662

Modified:
   trunk/surefire/debian/build.xml
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
Log:
Drop self Build-Depends on libsurefire-java


Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2012-01-08 00:13:07 UTC (rev 15661)
+++ trunk/surefire/debian/build.xml	2012-01-08 02:22:42 UTC (rev 15662)
@@ -19,7 +19,7 @@
     <macrodef name="packagemodule">
 	    <attribute name="dir"/>
 	    <sequential>
-		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+		<ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
           <property name="debian.dir" location="debian" />
           <property name="project.dir" value="@{dir}" />
           <property name="keep-cleaned-pom" value="true" />
@@ -31,7 +31,7 @@
     <macrodef name="package-plugin-module">
 	    <attribute name="dir"/>
 	    <sequential>
-		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+		<ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
           <property name="debian.dir" location="debian" />
           <property name="project.dir" value="@{dir}" />
           <property name="maven.generate.target" value="plugin:descriptor" />
@@ -44,7 +44,7 @@
     <macrodef name="package-shaded-module">
 	    <attribute name="dir"/>
 	    <sequential>
-		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+		<ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
           <property name="debian.dir" location="debian" />
           <property name="project.dir" value="@{dir}" />
           <property name="maven.package.target" value="install" />
@@ -83,16 +83,7 @@
     <target name="package">
         <packagemodule dir=""/>
         <package-shaded-module dir="surefire-api"/>
-        <mkdir dir="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian" /> 
-        <copy file="surefire-api/target/surefire-api-${version}.jar" 
-           tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.jar" />
-        <copy file="debian/.mh/pom.xml" 
-           tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.pom" />
         <package-shaded-module dir="surefire-booter"/>
-        <copy file="surefire-booter/target/surefire-booter-${version}.jar" 
-           tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.jar" />
-        <copy file="debian/.mh/pom.xml"
-           tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.pom" />
         <packagemodule dir="surefire-providers"/>
         <packagemodule dir="surefire-providers/common-junit3"/>
         <packagemodule dir="surefire-providers/common-junit4"/>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2012-01-08 00:13:07 UTC (rev 15661)
+++ trunk/surefire/debian/changelog	2012-01-08 02:22:42 UTC (rev 15662)
@@ -1,3 +1,11 @@
+surefire (2.10-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Drop self Build-Depends on libsurefire-java. (Closes: #655011).
+    Thanks to Daniel Schepler for the patch.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 07 Jan 2012 20:14:23 -0430
+
 surefire (2.10-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2012-01-08 00:13:07 UTC (rev 15661)
+++ trunk/surefire/debian/control	2012-01-08 02:22:42 UTC (rev 15662)
@@ -8,7 +8,7 @@
  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, libsurefire-java,
+ junit, junit4, testng, libjmock-java,
  libmaven-common-artifact-filters-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire