[pkg-java] r6803 - trunk/stylebook/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:53:52 +0000 (Wed, 30 Jul 2008)
New Revision: 6803

Modified:
   trunk/stylebook/debian/changelog
   trunk/stylebook/debian/control
   trunk/stylebook/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/stylebook/debian/changelog
===================================================================
--- trunk/stylebook/debian/changelog	2008-07-30 18:51:03 UTC (rev 6802)
+++ trunk/stylebook/debian/changelog	2008-07-30 18:53:52 UTC (rev 6803)
@@ -1,3 +1,9 @@
+stylebook (1.0~b3~svn20061109-3) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 18:51:31 +0000
+
 stylebook (1.0~b3~svn20061109-2) unstable; urgency=low
 
   * Move to unstable.

Modified: trunk/stylebook/debian/control
===================================================================
--- trunk/stylebook/debian/control	2008-07-30 18:51:03 UTC (rev 6802)
+++ trunk/stylebook/debian/control	2008-07-30 18:53:52 UTC (rev 6803)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: java-gcj-compat-dev, ant, libxerces2-java
+Build-Depends-Indep: default-jdk, ant, libxerces2-java
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/stylebook
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/stylebook/
@@ -12,7 +12,7 @@
 Package: libstylebook-java
 Architecture: all
 Section: libs
-Depends: classpath-common | java1-runtime | java2-runtime, libxerces2-java
+Depends: default-jre | classpath-common | java1-runtime | java2-runtime, libxerces2-java
 Description: XML application for authoring web site content
  Stylebook is a way to convert a set of XML files into a proper web
  site with consistent navigation and layout.

Modified: trunk/stylebook/debian/rules
===================================================================
--- trunk/stylebook/debian/rules	2008-07-30 18:51:03 UTC (rev 6802)
+++ trunk/stylebook/debian/rules	2008-07-30 18:53:52 UTC (rev 6803)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-JAVA_HOME	:= /usr/lib/jvm/java-gcj
+JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS_BASE	:= /usr/share/java
 JAVACMD  	:= $(JAVA_HOME)/bin/java