[jmock] 13/48: Add libasm-java to Build-Depends and Suggest.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jmock.

commit d642a2957e55b9970e8f87c18c4e5863755c037a
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jul 14 01:30:12 2009 +0000

    Add libasm-java to Build-Depends and Suggest.
---
 debian/changelog           |  4 +---
 debian/control             |  7 ++++---
 debian/patches/build.patch | 23 +----------------------
 debian/rules               |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed0390d..af3a775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,7 @@ jmock (1.0.1-3) experimental; urgency=low
     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
 
diff --git a/debian/control b/debian/control
index 84ec87c..e16dcf7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,14 @@ Priority: optional
 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.
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 155d564..2710a5a 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -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>
+
diff --git a/debian/rules b/debian/rules
index cb11c93..3875dd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ JAVA_HOME  		:= /usr/lib/jvm/default-java
 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock.git