[Debian-med-packaging] [SCM] The European Molecular Biology Open Software Suite. branch, master, updated. debian/6.3.1-2-1-g9033833

[Charles Plessy]

The following commit has been merged in the master branch:
commit 90338335152b7bfb1d525e9f1eb24c9c996ae566
Author: Charles Plessy <plessy at debian.org>
Date:   Thu Jul 29 00:24:43 2010 +0900

    Use default Java instead of OpenJDK.

diff --git a/debian/changelog b/debian/changelog
index 32ca7e6..8499b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emboss (6.3.1-3) unstable; urgency=low
+
+  * Use default Java instead of OpenJDK (debian/control, debian/rules,
+    closes: #590553, thanks to Petr Salinger).
+  * Incremented Standards-Version in debian/control to reflect conformance
+    with Debian Policy 3.9.1 (no changes needed).
+
+ -- Charles Plessy <plessy at debian.org>  Wed, 28 Jul 2010 23:42:31 +0900
+
 emboss (6.3.1-2) unstable; urgency=low
 
   * First upstream patch for version 6.3.1 (debian/series,
diff --git a/debian/control b/debian/control
index e06ca44..9aa83aa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ DM-Upload-Allowed: yes
 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
+Standards-Version: 3.9.1
 Homepage: http://emboss.sourceforge.net
 
 Package: emboss
@@ -68,7 +68,7 @@ Description: EMBOSS Libraries
 
 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.
diff --git a/debian/rules b/debian/rules
index f0e724c..337ba6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,9 @@ NUCLEUS     = $(CURDIR)/debian/libnucleus6
 CONFFLAGS   = --prefix=/usr
 CONFFLAGS   += --bindir=/usr/lib/emboss
 CONFFLAGS   += --enable-systemlibs
+CONFFLAGS   += --with-java=/usr/lib/jvm/default-java/include
+CONFFLAGS   += --with-javaos=/usr/lib/jvm/default-java/include/linux
 
-# 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
 
 DEB_LDFLAGS += -lexpat
 DEB_LDFLAGS += $(shell mysql_config --libs)

-- 
The European Molecular Biology Open Software Suite.