[SCM] UNNAMED PROJECT branch, master, updated. 3a3b0b8dbc1ee40fae8a94d2e93b465085b53503

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 634a674a678d24717b7f0c082e266d97769c3f25
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Nov 20 23:54:20 2011 +0100

    Team upload.
    
    * Team upload.
    * Use default-jdk to build this package.

diff --git a/debian/changelog b/debian/changelog
index 87a5680..5c3f808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 weirdx (1.0.32-6) unstable; urgency=low
 
+  * Team upload.
+
+  [ Matthew Johnson ]
   * move to team repo and maintenance 
 
- -- Matthew Johnson <mjj29 at debian.org>  Sat, 17 Sep 2011 13:40:39 +0000
+  [ Damien Raude-Morvan ]
+  * Use default-jdk to build this package.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 20 Nov 2011 23:53:54 +0100
 
 weirdx (1.0.32-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6011837..9d41f4d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Johnson <mjj29 at debian.org>
 Build-Depends: debhelper (>> 7), javahelper (>= 0.25), quilt (>= 0.46-7)
-Build-Depends-Indep: openjdk-6-jdk
+Build-Depends-Indep: default-jdk
 Standards-Version: 3.8.1
 Homepage: http://www.jcraft.com/weirdx/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/weirdx.git
diff --git a/debian/rules b/debian/rules
index a5872dd..a0ce85d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
 	dh --with javahelper --with quilt $@
diff --git a/debian/weirdx.manifest b/debian/weirdx.manifest
index 7a24493..1add9fe 100644
--- a/debian/weirdx.manifest
+++ b/debian/weirdx.manifest
@@ -1,3 +1,3 @@
 usr/share/java/weirdx.jar:
  Main-Class: com.jcraft.weirdx.WeirdX
- Debian-Java-Home: /usr/lib/jvm/java-6-openjdk
+ Debian-Java-Home: /usr/lib/jvm/default-java

-- 
UNNAMED PROJECT