[dumbster] 02/18: Import Debian changes 1.6+debian-2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository dumbster.

commit 7ce1363d6f5b03c69b4068a5cd6edb23372e9a98
Author: Stefan Denker <Stefan+Debian at dn-kr.de>
Date:   Wed Sep 28 19:13:57 2011 +0200

    Import Debian changes 1.6+debian-2
    
    dumbster (1.6+debian-2) unstable; urgency=low
    
      * Change dependency to default-jdk (Closes: #643511)
---
 debian/changelog | 6 ++++++
 debian/control   | 4 +---
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2fc204..c7ea1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dumbster (1.6+debian-2) unstable; urgency=low
+
+  * Change dependency to default-jdk (Closes: #643511)
+
+ -- Stefan Denker <Stefan+Debian at dn-kr.de>  Wed, 28 Sep 2011 19:13:57 +0200
+
 dumbster (1.6+debian-1) unstable; urgency=low
 
   * Initial release 
diff --git a/debian/control b/debian/control
index ee6274a..17e3e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,13 @@ Priority: extra
 Maintainer: Stefan Denker <Stefan+Debian at dn-kr.de>
 Build-Depends: cdbs, debhelper (>= 7.0.50~)
 Build-Depends-Indep: 
-   openjdk-6-jdk
+   default-jdk
  , libgnumail-java
  , junit
  , ant
  , ant-optional
 Standards-Version: 3.9.2
 Homepage: http://quintanasoft.com/dumbster/
-Vcs-Cvs: :pserver:anonymous at dumbster.cvs.sourceforge.net:/cvsroot/dumbster
-Vcs-Browser: http://dumbster.cvs.sourceforge.net/viewvc/dumbster/
 
 Package: libdumbster-java
 Architecture: all
diff --git a/debian/rules b/debian/rules
index a17d8af..ed67a05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DESTDIR=debian/libdumbster-java
 # Add here any variable or target overrides you need.
 
 # Set either a single (JAVA_HOME) or multiple (JAVA_HOME_DIRS) java locations
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME = /usr/lib/jvm/default-java/
 
 DEB_JARS := /usr/share/java/ant-junit.jar
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dumbster.git