diff --git a/debian/changelog b/debian/changelog index 2fff7d7..278cda8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ libslf4j-java (1.5.8-1) UNRELEASED; urgency=low * New upstream release - * Move libslf4j-java to "java" section - * Bump Standards-Version to 3.8.1: no changes needed + * debian/control: + - Bump Standards-Version to 3.8.1: no changes needed + - Move libslf4j-java to "java" section + - Move ant to Build-Depends (needed for clean target) + - Build-Depends on default-jdk-builddep + * debian/rules: + - use /usr/lib/jvm/default-java as JAVA_HOME - -- Damien Raude-Morvan Sun, 14 Jun 2009 12:26:02 +0200 + -- Damien Raude-Morvan Mon, 15 Jun 2009 22:20:39 +0200 libslf4j-java (1.5.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 1c1c9ba..59d552d 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Varun Hiremath , Damien Raude-Morvan -Build-Depends: cdbs, debhelper (>= 6) -Build-Depends-Indep: ant, java-gcj-compat-dev, liblog4j1.2-java, - libcommons-logging-java, libcommons-lang-java, libjavassist-java +Build-Depends: cdbs, debhelper (>= 6), ant, default-jdk-builddep +Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java, + libcommons-lang-java, libjavassist-java Standards-Version: 3.8.1 Homepage: http://www.slf4j.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libslf4j-java diff --git a/debian/rules b/debian/rules index 52912c3..48111db 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := jar DEB_ANT_BUILDFILE := debian/build.xml DEB_JARS := commons-logging log4j-1.2