[pkg-java] r12270 - trunk/easymock/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-03 18:05:09 +0000 (Mon, 03 May 2010)
New Revision: 12270

Modified:
   trunk/easymock/debian/changelog
   trunk/easymock/debian/control
   trunk/easymock/debian/rules
Log:
* Team upload.
* Switch to default-jdk and default-jre-headless. Thanks to Thierry Carrez.

Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog	2010-05-03 17:55:52 UTC (rev 12269)
+++ trunk/easymock/debian/changelog	2010-05-03 18:05:09 UTC (rev 12270)
@@ -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).

Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control	2010-05-03 17:55:52 UTC (rev 12269)
+++ trunk/easymock/debian/control	2010-05-03 18:05:09 UTC (rev 12270)
@@ -7,14 +7,14 @@
 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

Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules	2010-05-03 17:55:52 UTC (rev 12269)
+++ trunk/easymock/debian/rules	2010-05-03 18:05:09 UTC (rev 12270)
@@ -17,8 +17,7 @@
 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