Bug#307042: classworlds: FTBFS: Missing Build-Depends on 'junit'

[Matej Vela]

On Sat, Apr 30, 2005 at 10:55:54AM +0200, Andreas Jochens wrote:
> Package: classworlds
> Version: 1.0.1-1
> Severity: serious
> Tags: patch
> 
> The package FTBFS in a clean chroot environment because a Build-Depends
> on 'junit' is missing.
[...]

Fixed in NMU classworlds 1.0.1-1.1 (diff attached).  RM, please approve
this for sarge.

Thanks,

Matej

--- ../Attic/classworlds/classworlds-1.0.1/debian/changelog     2005-05-08 
22:14:37.000000000 +0200
+++ classworlds-1.0.1/debian/changelog  2005-05-08 22:29:01.000000000 +0200
@@ -1,3 +1,15 @@
+classworlds (1.0.1-1.1) unstable; urgency=high
+
+  * NMU during BSP.
+  * Fix build failure (thanks to Andreas Jochens for the patch):
+    - Add junit to build dependencies.
+    - debian/rules: Set JAVA_HOME.
+    - src/java/test/org/codehaus/classworlds/ClassRealmImplTest.java:
+      ClassWriter.visit() from libasm-java 1.5 expects a version argument.
+    Closes: #307042.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Sun,  8 May 2005 22:29:01 +0200
+
 classworlds (1.0.1-1) unstable; urgency=low
 
   * Initial Release.
--- ../Attic/classworlds/classworlds-1.0.1/debian/control       2005-05-08 
22:14:37.000000000 +0200
+++ classworlds-1.0.1/debian/control    2005-05-08 22:28:01.000000000 +0200
@@ -2,7 +2,7 @@
 Section: contrib/devel
 Priority: optional
 Maintainer: Marcus Crafter <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.0), libasm-java, libxerces2-java, ant, 
j2sdk1.4 | java2-compiler
+Build-Depends-Indep: debhelper (>= 4.0.0), junit, libasm-java, 
libxerces2-java, ant, j2sdk1.4 | java2-compiler
 Standards-Version: 3.6.1.1
 
 Package: libclassworlds-java
--- ../Attic/classworlds/classworlds-1.0.1/debian/rules 2005-05-08 
22:14:37.000000000 +0200
+++ classworlds-1.0.1/debian/rules      2005-05-08 22:18:09.000000000 +0200
@@ -6,6 +6,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.5-sun \
+                 /usr/lib/j2sdk1.4-sun \
+                 /usr/lib/j2sdk1.4-ibm \
+                 /usr/lib/j2sdk1.4-blackdown
+export JAVA_HOME ?= $(firstword $(wildcard $(JAVA_HOME_DIRS)))
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
--- 
../Attic/classworlds/classworlds-1.0.1/src/java/test/org/codehaus/classworlds/ClassRealmImplTest.java
       2004-04-04 00:21:36.000000000 +0200
+++ 
classworlds-1.0.1/src/java/test/org/codehaus/classworlds/ClassRealmImplTest.java
    2005-05-08 21:57:45.000000000 +0200
@@ -749,7 +749,7 @@
         ClassWriter cw = new ClassWriter(true);
         CodeVisitor cv;
 
-        cw.visit(ACC_PUBLIC, className, "java/lang/Object", null, null);
+        cw.visit(V1_1, ACC_PUBLIC, className, "java/lang/Object", null, null);
 
         cw.visitField(ACC_PRIVATE, fieldName, "Ljava/lang/String;", null, 
null);