[SCM] UNNAMED PROJECT branch, master, updated. 5c6dbc43c3bc4a1739f2ed10ab64f024d6327f80

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit eab45182bcdb2547758a5db0cd892a94bea1a5a8
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon Nov 21 00:08:52 2011 +0100

    Team upload.
    
    * Team upload.
    * Switch to default-jdk (Closes: #642682).

diff --git a/debian/changelog b/debian/changelog
index 8143695..54c56b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 dbus-java (2.8-2) unstable; urgency=low
 
+  * Team upload.
+
+  [ Matthew Johnson ]
   * Move to a team-maintained package (moving to java team not utopia) 
 
- -- Matthew Johnson <mjj29 at debian.org>  Sat, 17 Sep 2011 12:34:57 +0000
+  [ Damien Raude-Morvan ]
+  * Switch to default-jdk (Closes: #642682).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 21 Nov 2011 00:07:59 +0100
 
 dbus-java (2.8-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a62551e..ec1796b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainer <pkg-java-maintainers at lists.alioth.org>
 Uploaders: Matthew Johnson <mjj29 at debian.org>
-Build-Depends: openjdk-6-jdk,
+Build-Depends: default-jdk,
                debhelper (>= 7.0.50~),
                docbook-to-man,
                tex4ht,
diff --git a/debian/rules b/debian/rules
index 09f8e2c..1e0795a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Rules file to build dbus-java packages by Matthew Johnson
 #
 
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
 	dh --with javahelper $@

-- 
UNNAMED PROJECT