[pkg-java] r14889 - trunk/surefire/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-09-13 14:02:54 +0000 (Tue, 13 Sep 2011)
New Revision: 14889

Modified:
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
   trunk/surefire/debian/rules
Log:
Switch to default-jdk


Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2011-09-13 08:28:56 UTC (rev 14888)
+++ trunk/surefire/debian/changelog	2011-09-13 14:02:54 UTC (rev 14889)
@@ -1,3 +1,10 @@
+surefire (2.4.3-5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #641380).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 13 Sep 2011 07:27:04 -0430
+
 surefire (2.4.3-4) unstable; urgency=low
 
   * Switch to source format 3.0.

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2011-09-13 08:28:56 UTC (rev 14888)
+++ trunk/surefire/debian/control	2011-09-13 14:02:54 UTC (rev 14889)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>= 7.3), ant, ant-optional,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-install-plugin-java, 
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java,

Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules	2011-09-13 08:28:56 UTC (rev 14888)
+++ trunk/surefire/debian/rules	2011-09-13 14:02:54 UTC (rev 14889)
@@ -5,7 +5,7 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps maven-core maven-model maven-plugin-api maven-project file-management plexus-utils plexus-container-default-alpha
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml