[med-svn] r11955 - trunk/packages/biojava3/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2012-08-01 13:48:09 +0000 (Wed, 01 Aug 2012)
New Revision: 11955

Modified:
   trunk/packages/biojava3/trunk/debian/changelog
   trunk/packages/biojava3/trunk/debian/control
Log:
Use default-jdk, patch from Ubuntu

Modified: trunk/packages/biojava3/trunk/debian/changelog
===================================================================
--- trunk/packages/biojava3/trunk/debian/changelog	2012-08-01 13:41:15 UTC (rev 11954)
+++ trunk/packages/biojava3/trunk/debian/changelog	2012-08-01 13:48:09 UTC (rev 11955)
@@ -1,3 +1,13 @@
+biojava3-live (3.0.4-2) unstable; urgency=low
+
+  [ Olivier Sallou ]
+  Patch from James Page <james.page at ubuntu.com> (Closes: #683513).
+  * Transition to use default java implementation:
+    - d/control: Use default-jdk (>= 1:1.6) instead of openjdk-6-jdk
+      for package build. 
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 01 Aug 2012 15:45:32 +0200
+
 biojava3-live (3.0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #674265)

Modified: trunk/packages/biojava3/trunk/debian/control
===================================================================
--- trunk/packages/biojava3/trunk/debian/control	2012-08-01 13:41:15 UTC (rev 11954)
+++ trunk/packages/biojava3/trunk/debian/control	2012-08-01 13:48:09 UTC (rev 11955)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: libcommons-dbcp-java (>= 1.1), libhsqldb-java,
  libcommons-collections-java (>= 2.1), libcommons-pool-java (>= 1.1),
  libcommons-cli-java, libguava-java (>= 11.0.1),
- openjdk-6-jdk | sun-java6-jdk, junit4,javahelper (>=0.25), libjgrapht-java,
+ default-jdk (>= 1:1.6), junit4,javahelper (>=0.25), libjgrapht-java,
  ant-optional, jmol-applet, icedtea-netx, libhamcrest-java, libjson-simple-java
 Build-Depends: debhelper (>= 9), ant
 Standards-Version: 3.9.3