[pkg-java] r10729 - trunk/ivy/debian

[Varun Hiremath]

Author: varun
Date: 2009-10-01 23:50:41 +0000 (Thu, 01 Oct 2009)
New Revision: 10729

Modified:
   trunk/ivy/debian/changelog
   trunk/ivy/debian/control
   trunk/ivy/debian/rules
Log:
* Switch to default-jdk
* Bump Standards-Version to 3.8.3 (no changes)

Modified: trunk/ivy/debian/changelog
===================================================================
--- trunk/ivy/debian/changelog	2009-10-01 23:41:44 UTC (rev 10728)
+++ trunk/ivy/debian/changelog	2009-10-01 23:50:41 UTC (rev 10729)
@@ -4,8 +4,10 @@
   * Include the MANIFEST.MF file in the jar (Closes: #548311)
   * Add debian/README.Debian listing reasons for not creating symlink to
     ivy.jar in ant's lib directory and solutions (Closes: #547969)
+  * Switch to default-jdk
+  * Bump Standards-Version to 3.8.3 (no changes)
 
- -- Varun Hiremath <varun at debian.org>  Thu, 01 Oct 2009 19:40:28 -0400
+ -- Varun Hiremath <varun at debian.org>  Thu, 01 Oct 2009 19:47:35 -0400
 
 ivy (2.1.0~rc2-2) unstable; urgency=low
 

Modified: trunk/ivy/debian/control
===================================================================
--- trunk/ivy/debian/control	2009-10-01 23:41:44 UTC (rev 10728)
+++ trunk/ivy/debian/control	2009-10-01 23:50:41 UTC (rev 10729)
@@ -5,11 +5,11 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: cdbs, debhelper (>= 6)
-Build-Depends-Indep: maven-repo-helper, ant, openjdk-6-jdk, libcommons-httpclient-java,
+Build-Depends-Indep: maven-repo-helper, ant, default-jdk, libcommons-httpclient-java,
  libcommons-lang-java, libcommons-cli-java, liboro-java,
  libcommons-collections-java, libcommons-vfs-java, junit,
  libjsch-java, openjdk-6-doc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://ant.apache.org/ivy/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ivy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ivy

Modified: trunk/ivy/debian/rules
===================================================================
--- trunk/ivy/debian/rules	2009-10-01 23:41:44 UTC (rev 10728)
+++ trunk/ivy/debian/rules	2009-10-01 23:50:41 UTC (rev 10729)
@@ -6,7 +6,7 @@
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 MVN_VERSION          := $(shell echo $(VERSION) | sed 's/~/-/')
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_JARS             := commons-httpclient commons-lang commons-cli commons-collections \