[pkg-java] r2804 - branches/commons-daemon/feature/debian/debian
Marcus Better
marcusb-guest at alioth.debian.org
Wed Nov 29 10:38:49 CET 2006
Author: marcusb-guest
Date: 2006-11-29 10:38:49 +0100 (Wed, 29 Nov 2006)
New Revision: 2804
Removed:
branches/commons-daemon/feature/debian/debian/jsvc.1
Modified:
branches/commons-daemon/feature/debian/debian/changelog
branches/commons-daemon/feature/debian/debian/control
branches/commons-daemon/feature/debian/debian/rules
Log:
Get rid of CDBS. Build man page with docbook-to-man. Add docbook-to-man and autoconf to build-deps, remove libxerces2-java and libjaxp1.2-java.
Modified: branches/commons-daemon/feature/debian/debian/changelog
===================================================================
--- branches/commons-daemon/feature/debian/debian/changelog 2006-11-28 13:35:59 UTC (rev 2803)
+++ branches/commons-daemon/feature/debian/debian/changelog 2006-11-29 09:38:49 UTC (rev 2804)
@@ -1,6 +1,13 @@
commons-daemon (1.0.2~svn20061127-1) unstable; urgency=low
* Support the arm, hppa, ia64, m68k, mipsel, and s390 architectures.
+ * debian/control:
+ - Fix build deps: remove libxerces2-java, add autoconf
+ and docbook-to-man.
+ - Clean up package descriptions.
+ * debian/rules:
+ - Get rid of CDBS.
+ - Pass correct host options to autoconf.
-- Marcus Better <marcus at better.se> Tue, 28 Nov 2006 13:49:20 +0100
Modified: branches/commons-daemon/feature/debian/debian/control
===================================================================
--- branches/commons-daemon/feature/debian/debian/control 2006-11-28 13:35:59 UTC (rev 2803)
+++ branches/commons-daemon/feature/debian/debian/control 2006-11-29 09:38:49 UTC (rev 2804)
@@ -3,7 +3,9 @@
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.0.0), cdbs, java-gcj-compat-dev, junit, ant, libxerces2-java, libjaxp1.2-java, autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, docbook-to-man
+Build-Depends-Indep: autoconf, java-gcj-compat-dev, ant, junit
+Build-Conflicts: autoconf2.13
Standards-Version: 3.7.2
Package: libcommons-daemon-java
Deleted: branches/commons-daemon/feature/debian/debian/jsvc.1
===================================================================
--- branches/commons-daemon/feature/debian/debian/jsvc.1 2006-11-28 13:35:59 UTC (rev 2803)
+++ branches/commons-daemon/feature/debian/debian/jsvc.1 2006-11-29 09:38:49 UTC (rev 2804)
@@ -1,110 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "JSVC" 1 "" "" ""
-.SH NAME
-jsvc \- application to launch java daemon
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 5
-\fBjsvc\fR [\-jvm\ \fIJVM\ name\fR] [\-classpath\ \fIpath\fR] [\-cp\ \fIpath\fR] [\-home\ \fIdirectory\fR] [\-version] [\-help] [\-?] [\-nodetach] [\-debug] [\-check] [\-user\ \fIuser\fR] [\-wait\ \fIwaittime\fR] [\-stop] [\-verbose\fI:class|gc|jni\fR] [\-outfile\ \fI/full/path/to/file\fR] [\-errfile\ \fI/full/path/to/file\fR] [\-pidfile\ \fI/full/path/to/file\fR] [\-Dproperty=\fIvalue\fR] [\-X\fIoption\fR]
-.ad
-.hy
-
-.SH "DESCRIPTION"
-
-.PP
-\fBjsvc\fR executes \fIclassfile\fR that implements a Daemon interface\&.
-
-.SH "OPTIONS"
-
-.TP
-\fB\-jvm\fR JVM name
-use a specific Java Virtual Machine\&.
-
-.TP
-\fB\-cp/ \-classpath\fR directory and zip/jar files
-set search path for service classes and resouces
-
-.TP
-\fB\-home\fR directory
-set the path of your JDK or JRE installation (or set the JAVA_HOME environment variable)
-
-.TP
-\fB\-version\fR
-show the current Java environment version (to check correctness of \-home and \-jvm\&. Implies \-nodetach)
-
-.TP
-\fB\-help\fR
-show this help page (implies \-nodetach)
-
-.TP
-\fB\-nodetach\fR
-don't detach from parent process and become a daemon
-
-.TP
-\fB\-debug\fR
-verbosely print debugging information
-
-.TP
-\fB\-check\fR
-only check service (implies \-nodetach)
-
-.TP
-\fB\-stop\fR
-stop the service using the file given in the \-pidfile option
-
-.TP
-\fB\-wait\fR waittime
-wait up to waittime seconds for the service to start waittime should multiple of 10 (min=10)
-
-.TP
-\fB\-user\fR user
-user used to run the daemon (defaults to current user)
-
-.TP
-\fB\-verbose[:class|gc|jni]\fR
-enable verbose output
-
-.TP
-\fB\-outfile\fR /full/path/to/file
-Location for output from stdout (defaults to /dev/null)\&. Use the value '&2' to simulate '1>&2'
-
-.TP
-\fB\-errfile\fR /full/path/to/file
-Location for output from stderr (defaults to /dev/null)\&. Use the value '&1' to simulate '2>&1'
-
-.TP
-\fB\-pidfile\fR /full/path/to/file
-Location for output from the file containing the pid of jsvc (defaults to /var/run/jsvc\&.pid)
-
-.TP
-\fB\-D\fR<name>=<value>
-set a Java system property
-
-.TP
-\fB\-X\fR<option>
-set Virtual Machine specific option
-
-.SH "AUTHOR"
-
-.PP
-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\&.
-
Modified: branches/commons-daemon/feature/debian/debian/rules
===================================================================
--- branches/commons-daemon/feature/debian/debian/rules 2006-11-28 13:35:59 UTC (rev 2803)
+++ branches/commons-daemon/feature/debian/debian/rules 2006-11-29 09:38:49 UTC (rev 2804)
@@ -1,35 +1,111 @@
#!/usr/bin/make -f
-# debian/rules for commons-daemon
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_JARS := ant ant-launcher
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_JARS := jaxp-1.2 xercesImpl
-DEB_ANT_BUILD_TARGET := dist
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(ANT_ARGS)
-LIBRARY=commons-daemon
-VERSION=1.0.1
+PKGNAME := commons-daemon
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-clean::
+NATIVE_SRC := src/native/unix
+
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+$(NATIVE_SRC)/configure: $(NATIVE_SRC)/configure.in
+ cd $(NATIVE_SRC); autoconf
+
+config-stamp: $(NATIVE_SRC)/configure
+ dh_testdir
+ cd $(NATIVE_SRC); ./configure $(confflags) --with-java=$(JAVA_HOME)
+ touch config-stamp
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config-stamp debian/jsvc.1.xml
+ dh_testdir
+ $(MAKE) -C $(NATIVE_SRC)
+ docbook-to-man debian/jsvc.1.xml > debian/jsvc.1
+ touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp:
+ dh_testdir
+ $(ANT_INVOKE)
+ touch build-indep-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f *-stamp debian/jsvc.1
+ rm -rf target dist
-(cd src/native/unix ; make clean)
- -rm src/native/unix/config.log src/native/unix/config.status
- -rm src/native/unix/native/Makefile
- -rm src/native/unix/Makefile
- -rm src/native/unix/Makedefs
+ -rm -f src/native/unix/config.{log,status}
+ -rm -f src/native/unix/{Makefile,Makedefs,native/Makefile}
+ cp -f /usr/share/misc/config.sub $(NATIVE_SRC)/config.sub
+ cp -f /usr/share/misc/config.guess $(NATIVE_SRC)/config.guess
+ dh_clean
-common-configure-arch::
- cd src/native/unix ; ./configure --with-java=$(JAVA_HOME) --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+install: install-arch install-indep
-common-build-arch::
- cd src/native/unix ; make
+install-indep: build-indep
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+ dh_install -i
+ install -m 644 dist/$(PKGNAME).jar $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar
-install/lib${LIBRARY}-java::
- install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
+install-arch: build-arch
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+ dh_install -a
+ dh_installman -a
+
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary: binary-indep binary-arch
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-arch install-indep
More information about the pkg-java-commits
mailing list