[pkg-java] r15075 - trunk/libjibx-java/branch-1.2/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-09-27 20:14:44 +0000 (Tue, 27 Sep 2011)
New Revision: 15075

Modified:
   trunk/libjibx-java/branch-1.2/debian/changelog
   trunk/libjibx-java/branch-1.2/debian/control
   trunk/libjibx-java/branch-1.2/debian/rules
Log:
Switch to default-jdk


Modified: trunk/libjibx-java/branch-1.2/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/changelog	2011-09-27 19:57:38 UTC (rev 15074)
+++ trunk/libjibx-java/branch-1.2/debian/changelog	2011-09-27 20:14:44 UTC (rev 15075)
@@ -1,3 +1,10 @@
+libjibx1.2-java (1.2.3-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643532).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 27 Sep 2011 20:38:31 -0430
+
 libjibx1.2-java (1.2.3-1) unstable; urgency=low
 
   * Team upload

Modified: trunk/libjibx-java/branch-1.2/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/control	2011-09-27 19:57:38 UTC (rev 15074)
+++ trunk/libjibx-java/branch-1.2/debian/control	2011-09-27 20:14:44 UTC (rev 15075)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
+Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), default-jdk, ant, quilt
 Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java,
  libjoda-time-java
 Standards-Version: 3.9.1

Modified: trunk/libjibx-java/branch-1.2/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/rules	2011-09-27 19:57:38 UTC (rev 15074)
+++ trunk/libjibx-java/branch-1.2/debian/rules	2011-09-27 20:14:44 UTC (rev 15075)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j-1.2 qdox xpp3 joda-time
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
 DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)