[pkg-java] r10955 - trunk/libezmorph-java/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2009-10-30 13:54:59 +0000 (Fri, 30 Oct 2009)
New Revision: 10955

Modified:
   trunk/libezmorph-java/debian/build.xml
   trunk/libezmorph-java/debian/changelog
   trunk/libezmorph-java/debian/control
   trunk/libezmorph-java/debian/rules
Log:
* debian/control, debian/rules: Build-depend on default-jdk
* debian/control: Set libezmorph-java runtime dependency on
  "default-jre-headless | java2-runtime-headless"
* debian/build.xml: Downgrade source/target code to 1.4 to match runtime
  dependency (java2-runtime-headless)

Modified: trunk/libezmorph-java/debian/build.xml
===================================================================
--- trunk/libezmorph-java/debian/build.xml	2009-10-29 14:06:39 UTC (rev 10954)
+++ trunk/libezmorph-java/debian/build.xml	2009-10-30 13:54:59 UTC (rev 10955)
@@ -9,7 +9,7 @@
   <target name="compile" description="o Compile the source files">
     <mkdir dir="${class.dir}"/>
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" source="1.4" target="1.4"/>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/libezmorph-java/debian/changelog
===================================================================
--- trunk/libezmorph-java/debian/changelog	2009-10-29 14:06:39 UTC (rev 10954)
+++ trunk/libezmorph-java/debian/changelog	2009-10-30 13:54:59 UTC (rev 10955)
@@ -1,3 +1,13 @@
+libezmorph-java (1.0.6-2) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules: Build-depend on default-jdk
+  * debian/control: Set libezmorph-java runtime dependency on
+    "default-jre-headless | java2-runtime-headless"
+  * debian/build.xml: Downgrade source/target code to 1.4 to match runtime
+    dependency (java2-runtime-headless)
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 30 Oct 2009 13:52:39 +0100
+
 libezmorph-java (1.0.6-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/libezmorph-java/debian/control
===================================================================
--- trunk/libezmorph-java/debian/control	2009-10-29 14:06:39 UTC (rev 10954)
+++ trunk/libezmorph-java/debian/control	2009-10-30 13:54:59 UTC (rev 10955)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, libcommons-lang-java,
+Build-Depends-Indep: ant, default-jdk, libcommons-lang-java,
  libcommons-beanutils-java, libcommons-logging-java, junit4
 Standards-Version: 3.8.0
 Homepage: http://ezmorph.sourceforge.net
@@ -13,7 +13,7 @@
 
 Package: libezmorph-java
 Architecture: all
-Depends:  java-gcj-compat | java1-runtime | java2-runtime
+Depends:  default-jre-headless | java2-runtime-headless
 Description: Java library for transforming an Object to another Object
  EZMorph's key strenghts are:
  .

Modified: trunk/libezmorph-java/debian/rules
===================================================================
--- trunk/libezmorph-java/debian/rules	2009-10-29 14:06:39 UTC (rev 10954)
+++ trunk/libezmorph-java/debian/rules	2009-10-30 13:54:59 UTC (rev 10955)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_JARS             := commons-lang commons-beanutils commons-logging junit4