[pkg-java] r10830 - trunk/libxstream-java/debian

[Varun Hiremath]

Author: varun
Date: 2009-10-15 18:43:33 +0000 (Thu, 15 Oct 2009)
New Revision: 10830

Modified:
   trunk/libxstream-java/debian/changelog
   trunk/libxstream-java/debian/compat
   trunk/libxstream-java/debian/control
   trunk/libxstream-java/debian/rules
Log:
* Switch to default-jdk
* Build-Depends: replace cglib2.1 with cglib (Closes: #550613)
* Bump Standards-Version to 3.8.3
* Bump dh compat to 7

Modified: trunk/libxstream-java/debian/changelog
===================================================================
--- trunk/libxstream-java/debian/changelog	2009-10-15 18:32:23 UTC (rev 10829)
+++ trunk/libxstream-java/debian/changelog	2009-10-15 18:43:33 UTC (rev 10830)
@@ -1,3 +1,12 @@
+libxstream-java (1.3.1-5) unstable; urgency=low
+
+  * Switch to default-jdk
+  * Build-Depends: replace cglib2.1 with cglib (Closes: #550613)
+  * Bump Standards-Version to 3.8.3
+  * Bump dh compat to 7
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 15 Oct 2009 14:35:55 -0400
+
 libxstream-java (1.3.1-4) unstable; urgency=low
 
   * Add missing dependencies to Depends and Suggests

Modified: trunk/libxstream-java/debian/compat
===================================================================
--- trunk/libxstream-java/debian/compat	2009-10-15 18:32:23 UTC (rev 10829)
+++ trunk/libxstream-java/debian/compat	2009-10-15 18:43:33 UTC (rev 10830)
@@ -1 +1 @@
-5
+7

Modified: trunk/libxstream-java/debian/control
===================================================================
--- trunk/libxstream-java/debian/control	2009-10-15 18:32:23 UTC (rev 10829)
+++ trunk/libxstream-java/debian/control	2009-10-15 18:43:33 UTC (rev 10830)
@@ -3,11 +3,11 @@
 Priority: optional
 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: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, openjdk-6-jdk, libxom-java, libjoda-time-java,
- libjettison-java, libcglib2.1-java, libdom4j-java, libxpp3-java,
+Build-Depends: debhelper (>= 7), cdbs
+Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java,
+ libjettison-java, libcglib-java, libdom4j-java, libxpp3-java,
  libjdom1-java, maven-repo-helper
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://xstream.codehaus.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxstream-java

Modified: trunk/libxstream-java/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules	2009-10-15 18:32:23 UTC (rev 10829)
+++ trunk/libxstream-java/debian/rules	2009-10-15 18:43:33 UTC (rev 10830)
@@ -5,7 +5,7 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE    := xstream/build.xml
 DEB_ANT_BUILD_TARGET := benchmark:compile jar
 DEB_JARS             := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1