[pkg-java] r16080 - trunk/libcommons-compress-java/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Tue May 29 23:32:23 UTC 2012


Author: drazzib
Date: 2012-05-29 23:32:23 +0000 (Tue, 29 May 2012)
New Revision: 16080

Modified:
   trunk/libcommons-compress-java/debian/ant.properties
   trunk/libcommons-compress-java/debian/build.xml
   trunk/libcommons-compress-java/debian/changelog
   trunk/libcommons-compress-java/debian/control
   trunk/libcommons-compress-java/debian/copyright
   trunk/libcommons-compress-java/debian/rules
Log:
* Team upload.
* Enablement of JUnit test suite (LP: #876413) (Closes: 646090):
  - d/build.xml: Provide targets to compile and execute test suite.
  - d/control: Add B-D's on junit and ant-optional to support testing.
  - d/rules: Add ant-junit and junit to DEB_JARS for testing.
* d/copyright: Updated for revised field names.
* d/control: Bumped Standards-Version: 3.9.3, no changes.

Modified: trunk/libcommons-compress-java/debian/ant.properties
===================================================================
--- trunk/libcommons-compress-java/debian/ant.properties	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/ant.properties	2012-05-29 23:32:23 UTC (rev 16080)
@@ -2,3 +2,8 @@
 class.dir=build
 source.dir=src/main/java
 jar=commons-compress.jar
+test.dir=test
+test.class.dir=${test.dir}/build
+test.source.dir=src/test/java
+test.res.dir=src/test/resources
+test.results.dir=${test.dir}/results

Modified: trunk/libcommons-compress-java/debian/build.xml
===================================================================
--- trunk/libcommons-compress-java/debian/build.xml	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/build.xml	2012-05-29 23:32:23 UTC (rev 16080)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jar" name="${project.name}" basedir="..">
+<project default="package" name="${project.name}" basedir="..">
 
   <target name="clean">
     <delete dir="${class.dir}" quiet="true"/>
+    <delete dir="${test.dir}" quiet="true"/>
   </target>
 
   <target name="compile" description="o Compile the source files">
@@ -12,6 +13,42 @@
       debug="true" source="1.5"/>
   </target>
 
+  <target name="test-compile" description="o Compile the test source files" depends="compile">
+    <mkdir dir="${test.class.dir}"/>
+    <javac srcdir="${test.source.dir}" destdir="${test.class.dir}"
+      debug="true" source="1.5" encoding="ISO-8859-1">
+      <classpath>
+         <pathelement location="${class.dir}"/>
+         <pathelement path="${java.class.path}"/>
+      </classpath>
+    </javac>
+    <copy todir="${test.class.dir}">
+      <fileset dir="${test.res.dir}">
+         <exclude name="**/*.java"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="test" depends="test-compile">
+     <mkdir dir="${test.results.dir}"/>
+     <junit printsummary="yes" haltonfailure="yes">
+       <classpath>
+         <pathelement location="${class.dir}"/>
+         <pathelement location="${test.class.dir}"/>
+         <pathelement path="${java.class.path}"/>
+       </classpath>
+       <formatter type="plain"/>
+       <batchtest todir="${test.results.dir}">
+         <fileset dir="${test.source.dir}">
+            <include name="**/*TestCase.java"/>
+            <include name="**/*Test.java"/>
+            <exclude name="**/*$*"/>
+            <exclude name="**/Abstract*"/>
+         </fileset>
+       </batchtest>
+     </junit>
+  </target>
+
   <target name="jar" description="o Create the jar" depends="compile">
     <jar jarfile="${jar}">
       <fileset dir="${class.dir}">
@@ -20,4 +57,6 @@
     </jar>
   </target>
 
+  <target name="package" depends="test,jar"/>
+
 </project>

Modified: trunk/libcommons-compress-java/debian/changelog
===================================================================
--- trunk/libcommons-compress-java/debian/changelog	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/changelog	2012-05-29 23:32:23 UTC (rev 16080)
@@ -1,3 +1,19 @@
+libcommons-compress-java (1.2-2) unstable; urgency=low
+
+  * Team upload.
+
+  [ James Page ]
+  * Enablement of JUnit test suite (LP: #876413) (Closes: 646090):
+    - d/build.xml: Provide targets to compile and execute test suite.
+    - d/control: Add B-D's on junit and ant-optional to support testing.
+    - d/rules: Add ant-junit and junit to DEB_JARS for testing.
+  * d/copyright: Updated for revised field names.
+
+  [ Damien Raude-Morvan ]
+  * d/control: Bumped Standards-Version: 3.9.3, no changes.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 May 2012 01:26:41 +0200
+
 libcommons-compress-java (1.2-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libcommons-compress-java/debian/control
===================================================================
--- trunk/libcommons-compress-java/debian/control	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/control	2012-05-29 23:32:23 UTC (rev 16080)
@@ -3,8 +3,14 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, maven-repo-helper
-Standards-Version: 3.8.3
+Build-Depends: ant,
+               ant-optional,
+               cdbs,
+               debhelper (>= 5),
+               default-jdk,
+               junit,
+               maven-repo-helper
+Standards-Version: 3.9.3
 Homepage: http://commons.apache.org/compress/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-compress-java/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-compress-java

Modified: trunk/libcommons-compress-java/debian/copyright
===================================================================
--- trunk/libcommons-compress-java/debian/copyright	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/copyright	2012-05-29 23:32:23 UTC (rev 16080)
@@ -1,8 +1,9 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Apache Commons Compress
-Maintainer: The Apache Software Foundation.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Commons Compress
+Upstream-Contact: The Apache Software Foundation.
 Source: http://commons.apache.org/compress/
 
+Files: *
 Copyright: 2001-2009, The Apache Software Foundation.
 License: Apache-2.0
 
@@ -13,4 +14,3 @@
 License: Apache-2.0
  On Debian GNU/Linux system you can find the complete text of the
  license in '/usr/share/common-licenses/Apache-2.0'
-

Modified: trunk/libcommons-compress-java/debian/rules
===================================================================
--- trunk/libcommons-compress-java/debian/rules	2012-05-29 23:30:53 UTC (rev 16079)
+++ trunk/libcommons-compress-java/debian/rules	2012-05-29 23:32:23 UTC (rev 16080)
@@ -5,6 +5,7 @@
 
 JAVA_HOME         := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := debian/build.xml
+DEB_JARS          := ant-junit junit
 PACKAGE           := commons-compress
 
 install/lib$(PACKAGE)-java:: 




More information about the pkg-java-commits mailing list