[libcommons-logging-java] 14/66: * (Build-)depend on default-jre/-jdk.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-logging-java.

commit 20cfda1d3ab8646bddf509f6b65f14297a7c06ad
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 16:06:23 2008 +0000

    * (Build-)depend on default-jre/-jdk.
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3ceec2..06b4b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcommons-logging-java (1.1.1-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 16:01:11 +0000
+
 libcommons-logging-java (1.1.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ac8166f..6af5f31 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: Arnaud Vandyck <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit, libservlet2.3-java
+Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, default-jdk, junit, libservlet2.3-java
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging
@@ -12,7 +12,7 @@ Homepage: http://commons.apache.org/logging
 
 Package: libcommons-logging-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.3-java
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libservlet2.3-java
 Suggests: liblog4j1.2-java, liblogkit-java, libavalon-framework-java
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for 
diff --git a/debian/rules b/debian/rules
index 315eb52..cee9204 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/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit

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