[Debian-med-packaging] Bug#590553: emboss: FTBFS on GNU/kFreeBSD and hppa (due to unsatisfied Build-Depends on openjdk-6-jdk)

[Petr Salinger]

Package: emboss
Version: 6.3.1-2
Severity: serious
Tags: patch
User: debian-bsd at lists.debian.org
Usertags: kfreebsd


Hi,

the emboss doesn't build on kfreebsd-i386, kfreebsd-amd64 and hppa anymore.
The problem is:
  emboss (6.3.1-2) unstable; urgency=low
    * Moved openjdk-6-jdk to Build-Depends

Please use default-jdk instead of openjdk-6-jdk
and default-jre instead of openjdk-6-jre, see diffs bellow.
These packages provide default java implementation,
on avr32, hppa, hurd-i386, kfreebsd-amd64, kfreebsd-i386, m68k
it is gcj and on the rest it is openjdk-6.

Thanks

 	Petr

--- debian/rules
+++ debian/rules
@@ -15,13 +15,8 @@
  CONFFLAGS   += --bindir=/usr/lib/emboss
  CONFFLAGS   += --enable-systemlibs

-# If openjdk-6-jdk is not installed don't tell configure to use it.
-# This allows binary-arch builds to be performed without openjdk
-# installed.
-ifneq ($(wildcard /usr/lib/jvm/java-6-openjdk/include/classfile_constants.h),)
-    CONFFLAGS += --with-java=/usr/lib/jvm/java-6-openjdk/include
-    CONFFLAGS += --with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux
-endif
+CONFFLAGS += --with-java=/usr/lib/jvm/default-java/include
+CONFFLAGS += --with-javaos=/usr/lib/jvm/default-java/include/linux

  DEB_LDFLAGS += -lexpat
  DEB_LDFLAGS += $(shell mysql_config --libs)



--- debian/control
+++ debian/control
@@ -6,8 +6,8 @@
  Uploaders: Charles Plessy <plessy at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
  Build-Depends: debhelper (>= 7), quilt, libx11-dev, x11proto-core-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev, libexpat1-dev, libmysqlclient-dev, libpq-dev, antiword, sharutils, autotools-dev, tcsh | csh | c-shell,
  # Needed until the following is solved: https://sourceforge.net/tracker/?func=detail&aid=3033326&group_id=93650&atid=605031
- openjdk-6-jdk
-#Build-Depends-Indep: openjdk-6-jdk
+ default-jdk
+#Build-Depends-Indep: default-jdk
  Vcs-Browser: http://git.debian.org/?p=debian-med/emboss.git
  Vcs-Git: git://git.debian.org/git/debian-med/emboss.git
  Standards-Version: 3.9.0
@@ -68,7 +68,7 @@

  Package: jemboss
  Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre, tcsh | csh | c-shell
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre, tcsh | csh | c-shell
  Description: graphical user interface to EMBOSS
   Jemboss is a Graphical User Interface (GUI) to EMBOSS, the European Molecular
   Biology Open Software Suite. It is part of the EMBOSS distribution.