From 19ffc3b244932f0abaeeea1658f52b0d991fae62 Mon Sep 17 00:00:00 2001 From: jestin Date: Fri, 30 Jul 2004 12:53:31 +0000 Subject: woody packaging control modification for proper depend --- debian/control | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 58e2214..2823fd0 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: devel Priority: optional Maintainer: Yannick Jestin #Standards-Version: 3.5.2 -Build-Depends: java-compiler, lynx, libregexp-java, (lib-gnu.getopt-java|libgetopt-java), docbook-utils, fastjar +Build-Depends: java-compiler, lynx, libregexp-java, lib-gnu.getopt-java | libgetopt-java, docbook-utils, fastjar Package: libivy-java Architecture: all -Depends: java-virtual-machine, (lib-gnu.getopt-java|libgetopt-java), libregexp-java +Depends: java-virtual-machine, lib-gnu.getopt-java | libgetopt-java, libregexp-java Suggests: Description: Ivy Software bus for java The libivy-java package is a pure-Java implementation of the Ivy software bus diff --git a/debian/rules b/debian/rules index 658980b..4a585e2 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ debian/stamp/binary/libivy-java : debian/stamp/build (cd doc; make) cp doc/ivy-java.1 $(mandir) mkdirhier $(docdir)/doc/html/api - ( cd src; javadoc -d $(docdir)/doc/html/api *java ) + ( cd src; make docs DOCS=$(docdir)/doc/html/api ) cp -R doc/ivy-java $(docdir)/doc/programmersguide cp -R doc/ivy-java.pdf $(docdir)/programmersguide.pdf gzip -9 $(mandir)/ivy-java.1 -- cgit v1.1