[pkg-java] r9267 - in trunk/jmock/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-14 01:30:12 +0000 (Tue, 14 Jul 2009)
New Revision: 9267

Modified:
   trunk/jmock/debian/changelog
   trunk/jmock/debian/control
   trunk/jmock/debian/patches/build.patch
   trunk/jmock/debian/rules
Log:
Add libasm-java to Build-Depends and Suggest.

Modified: trunk/jmock/debian/changelog
===================================================================
--- trunk/jmock/debian/changelog	2009-07-14 00:53:29 UTC (rev 9266)
+++ trunk/jmock/debian/changelog	2009-07-14 01:30:12 UTC (rev 9267)
@@ -13,9 +13,7 @@
     with dpatch)
   * Update debian/watch and add debian/orig-tar.sh to download a source
     tarball without any pre-compiled jars. 
-  * Skip running the unit tests are they were using library jars included in
-    the source distribution. I cannot run them anymore as the version of
-    cglib used was very old.
+  * Add libasm-java to Build-Depends and Suggest.
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 27 May 2009 20:11:43 +0100
 

Modified: trunk/jmock/debian/control
===================================================================
--- trunk/jmock/debian/control	2009-07-14 00:53:29 UTC (rev 9266)
+++ trunk/jmock/debian/control	2009-07-14 01:30:12 UTC (rev 9267)
@@ -4,13 +4,14 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.n>, Wolfgang Baer <WBaer at gmx.de>
 Build-Depends: debhelper (>= 6), quilt, default-jdk
-Build-Depends-Indep: ant (>= 1.6.5), junit (>= 3.8.1), ant-optional, maven-repo-helper
+Build-Depends-Indep: ant (>= 1.6.5), junit (>= 3.8.1), ant-optional, maven-repo-helper,
+ libasm-java
 Standards-Version: 3.8.1
 
 Package: libjmock-java
 Architecture: all
-Depends: ${misc:Depends}, kaffe (>= 2:1.1.5) | java1-runtime-headless | java2-runtime-headless
-Suggests: libjmock-java-doc
+Depends: ${misc:Depends}, default-java-headless | java2-runtime-headless
+Suggests: libjmock-java-doc, libasm-java
 Description: Java library for testing code with mock objects
  Mock objects help you design and test the interactions between the objects in
  your programs.

Modified: trunk/jmock/debian/patches/build.patch
===================================================================
--- trunk/jmock/debian/patches/build.patch	2009-07-14 00:53:29 UTC (rev 9266)
+++ trunk/jmock/debian/patches/build.patch	2009-07-14 01:30:12 UTC (rev 9267)
@@ -35,25 +35,4 @@
              </batchtest>
          </junit>
      </target>
-@@ -107,7 +118,8 @@
-         </junit>
-     </target>
- 
--    <target name="core.jar" depends="core.test.unit">
-+    <!-- skip the unit tests -->
-+    <target name="core.jar" depends="core.compile">
-         <mkdir dir="${build.dist.bin.dir}"/>
-         <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>
-     </target>
-@@ -167,8 +179,9 @@
-             </batchtest>
-         </junit>
-     </target>
--
--    <target name="cglib.jar" depends="cglib.test.unit">
-+
-+    <!-- skip the unit tests -->
-+    <target name="cglib.jar" depends="cglib.compile">
-         <mkdir dir="${build.dist.bin.dir}"/>
-         <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/>
-     </target>
+

Modified: trunk/jmock/debian/rules
===================================================================
--- trunk/jmock/debian/rules	2009-07-14 00:53:29 UTC (rev 9266)
+++ trunk/jmock/debian/rules	2009-07-14 01:30:12 UTC (rev 9267)
@@ -11,7 +11,7 @@
 JAVACMD         := $(JAVA_HOME)/bin/java
 ANT_PROPS       := debian/ant.properties
 ANT_HOME        := /usr/share/ant
-ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:$(JAVA_HOME)/lib/tools.jar
+ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:/usr/share/java/asm.jar:$(JAVA_HOME)/lib/tools.jar
 VERBOSE			:= #-verbose
 
 ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) org.apache.tools.ant.Main $(VERBOSE) -propertyfile $(ANT_PROPS)