[easymock] 16/41: * Team upload. * Switch to default-jdk and default-jre-headless. Thanks to Thierry Carrez.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository easymock.

commit 53edc2d4b9a0bf61fd3befeb18a1e53ee7ad8e35
Author: Torsten Werner <twerner at debian.org>
Date:   Mon May 3 18:05:09 2010 +0000

    * Team upload.
    * Switch to default-jdk and default-jre-headless. Thanks to Thierry Carrez.
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad64859..0cb1b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+easymock (2.4+ds1-4) unstable; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk and default-jre-headless. Thanks to Thierry Carrez.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 03 May 2010 20:00:08 +0200
+
 easymock (2.4+ds1-3) unstable; urgency=low
 
   * Updated dependency version of junit4 (Closes: #534017).
diff --git a/debian/control b/debian/control
index 4908e7f..dc4848e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ DM-Upload-Allowed: yes
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easymock/
 Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/easymock/
 Build-Depends: cdbs, debhelper (>= 5.0.42), dpatch (>= 2.0),
- openjdk-6-jdk (>= 6b11-5), ant-optional (>= 1.7.0), 
+ default-jdk, ant-optional (>= 1.7.0), 
  junit4 (>= 4.6-2)
 Standards-Version: 3.8.1
 Homepage: http://www.easymock.org
 
 Package: libeasymock-java
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre (>= 6b11) | java5-runtime
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless
 Suggests: libeasymock-java-doc
 Description: Java library to generate Mock Objects for given interfaces
  EasyMock 2 is a library that provides an easy way to use Mock Objects for given
diff --git a/debian/rules b/debian/rules
index 4432657..c2eff71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,7 @@ CHANGESFILE = ../easymock_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
 INSTDIR=$(CURDIR)/debian/libeasymock-java
 JAVADIR=$(INSTDIR)/usr/share/java
 
-# Explicitly build with OpenJDK
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_HOME = /usr/lib/jvm/default-java
 JAR = $(JAVA_HOME)/bin/jar
 
 # Set ant parameters

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git