The following commit has been merged in the master branch:
commit 9ae787d272e5f2e64f770b3d582ad4fc70790f26
Author: tony mancill <tmanc...@debian.org>
Date:   Sun Dec 4 11:19:27 2011 -0800

    use default-jdk

diff --git a/debian/changelog b/debian/changelog
index af47711..b78df7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+azureus (4.3.0.6-5) unstable; urgency=low
+
+  * Team upload.
+  * Use default-jdk/jre. (Closes: #639954)
+
+ -- tony mancill <tmanc...@debian.org>  Sun, 04 Dec 2011 11:17:04 -0800
+
 azureus (4.3.0.6-4) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 579060f..dc7def9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,11 @@ Maintainer: Debian Java Maintainers 
<pkg-java-maintain...@lists.alioth.debian.or
 Uploaders: Adrian Perez <adrianperez....@gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: ant, cdbs, debhelper (>= 7.0)
-Build-Depends-Indep: openjdk-6-jdk, libcommons-cli-java, liblog4j1.2-java, 
- libswt-gtk-3-java, junit
+Build-Depends-Indep: default-jdk,
+ libcommons-cli-java,
+ liblog4j1.2-java, 
+ libswt-gtk-3-java,
+ junit
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/azureus.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/azureus.git
@@ -14,7 +17,7 @@ Homepage: http://azureus.sourceforge.net
 
 Package: azureus
 Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre, 
+Depends: default-jre | openjdk-6-jre | sun-java5-jre | sun-java6-jre, 
  libcommons-cli-java, liblog4j1.2-java, libswt-gtk-3-java, 
  java-wrappers, ${misc:Depends}
 Recommends: vuze
@@ -44,6 +47,3 @@ Description: Multimedia BitTorrent client
  . 
  This package is part of the azureus package, and provides the dependencies
  necessary to run the new user interface.
-
-
-
diff --git a/debian/rules b/debian/rules
index 2102ea8..aaae6be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 -include /usr/share/topgit/tg2quilt.mk
 
-JAVA_HOME              := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME              := /usr/lib/jvm/default-jvm
 DEB_ANT_BUILDFILE      := debian/build.xml
 DEB_ANT_BUILD_TARGET   := package
 DEB_JARS               := log4j commons-cli swt junit

-- 
Azureus/Vuze packaging for Debian

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to