[pkg-java] r2810 - branches/commons-daemon/feature/debian/debian
Marcus Better
marcusb-guest at alioth.debian.org
Wed Nov 29 12:29:43 CET 2006
Author: marcusb-guest
Date: 2006-11-29 12:29:43 +0100 (Wed, 29 Nov 2006)
New Revision: 2810
Removed:
branches/commons-daemon/feature/debian/debian/jsvc.1.xml
Modified:
branches/commons-daemon/feature/debian/debian/control
branches/commons-daemon/feature/debian/debian/jsvc.manpages
branches/commons-daemon/feature/debian/debian/libcommons-daemon-java.doc-base
branches/commons-daemon/feature/debian/debian/rules
Log:
Fix manpage generation.
Modified: branches/commons-daemon/feature/debian/debian/control
===================================================================
--- branches/commons-daemon/feature/debian/debian/control 2006-11-29 10:05:11 UTC (rev 2809)
+++ branches/commons-daemon/feature/debian/debian/control 2006-11-29 11:29:43 UTC (rev 2810)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 5), autotools-dev, docbook-to-man
+Build-Depends: debhelper (>= 5), autotools-dev, xsltproc, docbook-xsl
Build-Depends-Indep: autoconf, java-gcj-compat-dev, ant
Build-Conflicts: autoconf2.13
Standards-Version: 3.7.2
Deleted: branches/commons-daemon/feature/debian/debian/jsvc.1.xml
===================================================================
--- branches/commons-daemon/feature/debian/debian/jsvc.1.xml 2006-11-29 10:05:11 UTC (rev 2809)
+++ branches/commons-daemon/feature/debian/debian/jsvc.1.xml 2006-11-29 11:29:43 UTC (rev 2810)
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<refentry id='jsvc1'>
- <refmeta>
- <refentrytitle>JSVC</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class='date'>October 2004</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.0</refmiscinfo>
- <refmiscinfo class='manual'>Jakarta project</refmiscinfo>
- </refmeta>
- <refnamediv id='name'>
- <refname>jsvc</refname>
- <refpurpose>application to launch java daemon</refpurpose>
- </refnamediv>
- <!-- body begins here -->
- <refsynopsisdiv id='synopsis'>
- <cmdsynopsis>
- <command>jsvc</command>
- <arg choice='opt'>-jvm <replaceable>JVM name</replaceable></arg>
- <arg choice='opt'>-classpath <replaceable>path</replaceable></arg>
- <arg choice='opt'>-cp <replaceable>path</replaceable></arg>
- <arg choice='opt'>-home <replaceable>directory</replaceable></arg>
- <arg choice='opt'>-version</arg>
- <arg choice='opt'>-help</arg>
- <arg choice='opt'>-?</arg>
- <arg choice='opt'>-nodetach</arg>
- <arg choice='opt'>-debug</arg>
- <arg choice='opt'>-check</arg>
- <arg choice='opt'>-user</arg>
- <arg choice='opt'>-verbose<replaceable>:class|gc|jni</replaceable></arg>
- <arg choice='opt'>-outfile <replaceable>/full/path/to/file</replaceable></arg>
- <arg choice='opt'>-errfile <replaceable>/full/path/to/file</replaceable></arg>
- <arg choice='opt'>-pidfile <replaceable>/full/path/to/file</replaceable></arg>
- <arg choice='opt'>-Dproperty=<replaceable>value</replaceable></arg>
- <arg choice='opt'>-X<replaceable>option</replaceable></arg>
- <!-- end of the new arguments -->
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1 id="description">
- <title>DESCRIPTION</title>
- <para><command>jsvc</command> executes <emphasis remap="I">classfile</emphasis>
- that implements a Daemon interface.</para>
- </refsect1>
-
- <refsect1 id="options">
- <title>OPTIONS</title>
-
- <variablelist remap="TP">
- <varlistentry>
- <term><option>-jvm</option> JVM name</term>
- <listitem>
- <para>use a specific Java Virtual Machine.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-cp/ -classpath</option> directory and zip/jar
- files</term>
- <listitem>
- <para>set search path for service classes and resouces</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-home</option> directory</term>
- <listitem>
- <para>set the path of your JDK or JRE installation (or set
- the JAVA_HOME environment variable)
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-version</option></term>
- <listitem>
- <para>show the current Java environment version (to check
- correctness of -home and -jvm. Implies -nodetach)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-help</option></term>
- <listitem>
- <para>show this help page (implies -nodetach)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-nodetach</option></term>
- <listitem>
- <para>don't detach from parent process and become a daemon</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-debug</option></term>
- <listitem>
- <para>verbosely print debugging information</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-check</option></term>
- <listitem>
- <para>only check service (implies -nodetach)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-user</option></term>
- <listitem>
- <para>user used to run the daemon (defaults to current user)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-verbose[:class|gc|jni]</option></term>
- <listitem>
- <para>enable verbose output</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-outfile</option> /full/path/to/file</term>
- <listitem>
- <para>Location for output from stdout (defaults to /dev/null). Use
- the value '&2' to simulate '1>&2'</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-errfile</option> /full/path/to/file</term>
- <listitem>
- <para>Location for output from stderr (defaults to /dev/null). Use
- the value '&1' to simulate '2>&1'</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-pidfile</option> /full/path/to/file</term>
- <listitem>
- <para>Location for output from the file containing the pid of jsvc
- (defaults to /var/run/jsvc.pid)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-D</option><name>=<value></term>
- <listitem>
- <para>set a Java system property</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-X</option><option></term>
- <listitem>
- <para>set Virtual Machine specific option</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 id='author'><title>AUTHOR</title>
- <para>JSVC is part of the Jakarta Commons Daemon project. Authors are
- Jean-Frederic Clere, Remy Maucherat, Yoav Shapira, Bill Barker. JSVC is
- under the Apache License Version 2.0.</para>
- </refsect1>
-
-</refentry>
Modified: branches/commons-daemon/feature/debian/debian/jsvc.manpages
===================================================================
--- branches/commons-daemon/feature/debian/debian/jsvc.manpages 2006-11-29 10:05:11 UTC (rev 2809)
+++ branches/commons-daemon/feature/debian/debian/jsvc.manpages 2006-11-29 11:29:43 UTC (rev 2810)
@@ -1 +1 @@
-debian/jsvc.1
+jsvc.1
Modified: branches/commons-daemon/feature/debian/debian/libcommons-daemon-java.doc-base
===================================================================
--- branches/commons-daemon/feature/debian/debian/libcommons-daemon-java.doc-base 2006-11-29 10:05:11 UTC (rev 2809)
+++ branches/commons-daemon/feature/debian/debian/libcommons-daemon-java.doc-base 2006-11-29 11:29:43 UTC (rev 2810)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-daemon-java-doc/apidocs/index.html
-Files: /usr/share/doc/libcommons-daemon-java-doc/apidocs/*
+Index: /usr/share/doc/libcommons-daemon-java/apidocs/index.html
+Files: /usr/share/doc/libcommons-daemon-java/apidocs/*
Modified: branches/commons-daemon/feature/debian/debian/rules
===================================================================
--- branches/commons-daemon/feature/debian/debian/rules 2006-11-29 10:05:11 UTC (rev 2809)
+++ branches/commons-daemon/feature/debian/debian/rules 2006-11-29 11:29:43 UTC (rev 2810)
@@ -17,6 +17,9 @@
ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
org.apache.tools.ant.Main $(ANT_ARGS)
+MAN_STYLESHEET := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XSLTPROC := xsltproc --nonet
+
PKGNAME := commons-daemon
INSTALLDIR := $(CURDIR)/debian/lib$(PKGNAME)-java
JAVALIBDIR := $(INSTALLDIR)/usr/share/java
@@ -44,10 +47,10 @@
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: config-stamp debian/jsvc.1.xml
+build-arch-stamp: config-stamp
dh_testdir
$(MAKE) -C $(NATIVE_SRC)
- docbook-to-man debian/jsvc.1.xml > debian/jsvc.1
+ $(XSLTPROC) $(MAN_STYLESHEET) $(NATIVE_SRC)/man/jsvc.1.xml
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -59,7 +62,7 @@
clean:
dh_testdir
dh_testroot
- rm -f *-stamp debian/jsvc.1
+ rm -f *-stamp jsvc.1
rm -rf target dist
-(cd src/native/unix ; make clean)
-rm -f src/native/unix/config.{log,status}
@@ -78,6 +81,7 @@
dh_install -i
install -m 644 dist/$(PKGNAME).jar $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar
ln -s $(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
+ dh_installdocs -i
mv $(DOCDIR)/api $(DOCDIR)/apidocs
install-arch: build-arch
@@ -86,13 +90,13 @@
dh_clean -k -a
dh_installdirs -a
dh_install -a
+ dh_installdocs -a
dh_installman -a
binary-common:
dh_testdir
dh_testroot
dh_installchangelogs
- dh_installdocs
dh_link
dh_strip
dh_compress
More information about the pkg-java-commits
mailing list