[pkg-java] r14374 - in trunk/surefire/debian: . source

[Torsten Werner]

Author: twerner
Date: 2011-08-21 19:56:23 +0000 (Sun, 21 Aug 2011)
New Revision: 14374

Added:
   trunk/surefire/debian/source/
   trunk/surefire/debian/source/format
Modified:
   trunk/surefire/debian/build.xml
   trunk/surefire/debian/changelog
   trunk/surefire/debian/compat
   trunk/surefire/debian/control
   trunk/surefire/debian/rules
Log:
* Switch to source format 3.0.
* Update debian/build.xml for newer maven-ant-helper. (Closes: #637824)
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.1.

Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2011-08-21 18:50:57 UTC (rev 14373)
+++ trunk/surefire/debian/build.xml	2011-08-21 19:56:23 UTC (rev 14374)
@@ -78,16 +78,16 @@
     <target name="package">
         <packagemodule dir=""/>
         <package-shaded-module dir="surefire-api"/>
-        <mkdir dir="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian" /> 
+        <mkdir dir="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian" /> 
         <copy file="surefire-api/target/surefire-api-${version}.jar" 
-           tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.jar" />
-        <copy file="debian/tmp/pom.xml" 
-           tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.pom" />
+           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/tmp/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.jar" />
-        <copy file="debian/tmp/pom.xml"
-           tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.pom" />
+           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/surefire-junit"/>
         <packagemodule dir="surefire-providers/surefire-junit4"/>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2011-08-21 18:50:57 UTC (rev 14373)
+++ trunk/surefire/debian/changelog	2011-08-21 19:56:23 UTC (rev 14374)
@@ -1,3 +1,12 @@
+surefire (2.4.3-4) unstable; urgency=low
+
+  * Switch to source format 3.0.
+  * Update debian/build.xml for newer maven-ant-helper. (Closes: #637824)
+  * Switch to debhelper level 7.
+  * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 21 Aug 2011 21:54:11 +0200
+
 surefire (2.4.3-3) unstable; urgency=low
 
   * Fix groupId for maven-plugin-testing-harness dependency

Modified: trunk/surefire/debian/compat
===================================================================
--- trunk/surefire/debian/compat	2011-08-21 18:50:57 UTC (rev 14373)
+++ trunk/surefire/debian/compat	2011-08-21 19:56:23 UTC (rev 14374)
@@ -1 +1 @@
-5
+7

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2011-08-21 18:50:57 UTC (rev 14373)
+++ trunk/surefire/debian/control	2011-08-21 19:56:23 UTC (rev 14374)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>= 7.3), ant, ant-optional,
  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
-Standards-Version: 3.8.1
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/surefire/
 Homepage: http://maven.apache.org/surefire/

Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules	2011-08-21 18:50:57 UTC (rev 14373)
+++ trunk/surefire/debian/rules	2011-08-21 19:56:23 UTC (rev 14374)
@@ -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/surefire/debian/source/format
===================================================================
--- trunk/surefire/debian/source/format	                        (rev 0)
+++ trunk/surefire/debian/source/format	2011-08-21 19:56:23 UTC (rev 14374)
@@ -0,0 +1 @@
+3.0 (quilt)