[pkg-java] r10956 - trunk/mockobjects/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2009-10-30 14:27:42 +0000 (Fri, 30 Oct 2009)
New Revision: 10956

Added:
   trunk/mockobjects/debian/ant.properties
Modified:
   trunk/mockobjects/debian/changelog
   trunk/mockobjects/debian/control
   trunk/mockobjects/debian/rules
Log:
* debian/control, debian/rules: Build-depend on default-jdk
* debian/control: Set libmockobjects-java runtime dependency on
  "default-jre-headless | java2-runtime-headless"
* Added debian/ant.properties to build java2-compatible code

Added: trunk/mockobjects/debian/ant.properties
===================================================================
--- trunk/mockobjects/debian/ant.properties	                        (rev 0)
+++ trunk/mockobjects/debian/ant.properties	2009-10-30 14:27:42 UTC (rev 10956)
@@ -0,0 +1,2 @@
+ant.build.javac.target=1.4
+ant.build.javac.source=1.4

Modified: trunk/mockobjects/debian/changelog
===================================================================
--- trunk/mockobjects/debian/changelog	2009-10-30 13:54:59 UTC (rev 10955)
+++ trunk/mockobjects/debian/changelog	2009-10-30 14:27:42 UTC (rev 10956)
@@ -1,3 +1,12 @@
+mockobjects (0.09-4) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules: Build-depend on default-jdk
+  * debian/control: Set libmockobjects-java runtime dependency on
+    "default-jre-headless | java2-runtime-headless"
+  * Added debian/ant.properties to build java2-compatible code
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 30 Oct 2009 15:22:56 +0100
+
 mockobjects (0.09-3) unstable; urgency=low
 
   * Add patches/AssertMo.diff to fix FTBFS (Closes: #458696)

Modified: trunk/mockobjects/debian/control
===================================================================
--- trunk/mockobjects/debian/control	2009-10-30 13:54:59 UTC (rev 10955)
+++ trunk/mockobjects/debian/control	2009-10-30 14:27:42 UTC (rev 10956)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit
+Build-Depends-Indep: ant, default-jdk, junit
 Standards-Version: 3.7.3
 Homepage: http://www.mockobjects.com
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/mockobjects
@@ -12,7 +12,7 @@
 
 Package: libmockobjects-java
 Architecture: all
-Depends: ${misc:Depends}, jave-gcj-compat | java2-runtime | java1-runtime
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Description: Framework for developing and using mock objects
  Mock Objects is a test-first driven framework for building
  generic software and/or unit testing frameworks. It supports:

Modified: trunk/mockobjects/debian/rules
===================================================================
--- trunk/mockobjects/debian/rules	2009-10-30 13:54:59 UTC (rev 10955)
+++ trunk/mockobjects/debian/rules	2009-10-30 14:27:42 UTC (rev 10956)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar-core javadoc
 DEB_JARS             := junit