CVS commons-daemon/debian

Wolfgang B??r wbaer-guest at haydn.debian.org
Sun Sep 11 11:33:00 UTC 2005


Update of /cvsroot/pkg-java/commons-daemon/debian
In directory haydn:/tmp/cvs-serv7871/debian

Modified Files:
	changelog control copyright docs jsvc.1 
	libcommons-daemon-java.links rules 
Log Message:
commons-daemon (1.0.1-1) unstable; urgency=low

  * New upstream release
  * Patch from upstream CVS to fix invalid execve() usage (closes: #314937)
  * libant1.6-java to ant transition (closes: #326436)
  * Added autotools-dev to let cdbs update the config.guess/sub
  * Standards-Version 3.6.2 (no changes)


--- /cvsroot/pkg-java/commons-daemon/debian/changelog	2005/04/10 21:38:04	1.4
+++ /cvsroot/pkg-java/commons-daemon/debian/changelog	2005/09/11 11:33:00	1.5
@@ -1,3 +1,18 @@
+commons-daemon (1.0.1-1) unstable; urgency=low
+
+  * New upstream release
+    + updated manpage for new options
+    + amd64 now supported 
+      (I will leave 307853 open until all debian platforms are supported)
+  * Patch from upstream CVS to fix invalid execve() usage (closes: #314937)
+  * libant1.6-java to ant transition (closes: #326436)
+  * Added autotools-dev to let cdbs update the config.guess/sub
+  * Standards-Version 3.6.2 (no changes)
+
+  * Upload sponsored by XXX
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 10 Sep 2005 17:45:46 +0200 
+
 commons-daemon (1.0-5) unstable; urgency=low
 
   * upload with the sources.
--- /cvsroot/pkg-java/commons-daemon/debian/control	2005/04/04 19:33:03	1.3
+++ /cvsroot/pkg-java/commons-daemon/debian/control	2005/09/11 11:33:00	1.4
@@ -3,12 +3,13 @@
 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>
-Build-Depends: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.4.PRECVS12-1), kaffe-dev (>= 2:1.1.4.PRECVS12-1), junit, libant1.6-java, libxerces2-java, libjaxp1.2-java
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), kaffe-dev (>= 2:1.1.5-3), junit, ant, libxerces2-java, libjaxp1.2-java, autotools-dev
+Standards-Version: 3.6.2
 
 Package: libcommons-daemon-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.4.PRECVS12-1) | java1-runtime | java2-runtime
+Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
+Suggests: java-virtual-machine
 Recommends: jsvc
 Description: Java API to launch java applications as daemons
  The libcommons-daemon-java package can be used to implement java applications
--- /cvsroot/pkg-java/commons-daemon/debian/copyright	2004/10/11 09:01:22	1.1.1.1
+++ /cvsroot/pkg-java/commons-daemon/debian/copyright	2005/09/11 11:33:00	1.2
@@ -185,29 +185,3 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- /cvsroot/pkg-java/commons-daemon/debian/docs	2005/04/04 19:33:03	1.2
+++ /cvsroot/pkg-java/commons-daemon/debian/docs	2005/09/11 11:33:00	1.3
@@ -1,4 +1,3 @@
-KEYS
 PROPOSAL.html
 README
 RELEASE-NOTES.txt
--- /cvsroot/pkg-java/commons-daemon/debian/jsvc.1	2004/10/11 09:01:22	1.1.1.1
+++ /cvsroot/pkg-java/commons-daemon/debian/jsvc.1	2005/09/11 11:33:00	1.2
@@ -24,14 +24,14 @@
 .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] [\-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]
+\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 classfile that implements a Daemon interface\&.
+\fBjsvc\fR executes \fIclassfile\fR that implements a Daemon interface\&.
 
 .SH "OPTIONS"
 
@@ -68,7 +68,15 @@
 only check service (implies \-nodetach)
 
 .TP
-\fB\-user\fR
+\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
--- /cvsroot/pkg-java/commons-daemon/debian/libcommons-daemon-java.links	2005/04/04 19:33:03	1.1
+++ /cvsroot/pkg-java/commons-daemon/debian/libcommons-daemon-java.links	2005/09/11 11:33:00	1.2
@@ -1 +1 @@
-usr/share/java/commons-daemon-1.0.jar usr/share/java/commons-daemon.jar
+usr/share/java/commons-daemon-1.0.1.jar usr/share/java/commons-daemon.jar
--- /cvsroot/pkg-java/commons-daemon/debian/rules	2005/04/04 19:33:03	1.2
+++ /cvsroot/pkg-java/commons-daemon/debian/rules	2005/09/11 11:33:00	1.3
@@ -4,32 +4,39 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant1.6
+ANT_HOME             := /usr/share/ant
 DEB_JARS             := ${ANT_HOME}/lib/ant-launcher.jar jaxp-1.2 xercesImpl
 DEB_ANT_COMPILER     := jikes
 DEB_ANT_BUILD_TARGET := dist
 
 LIBRARY=commons-daemon
-VERSION=1.0
+VERSION=1.0.1
 
 clean::
 	-(cd src/native/unix ; make clean)
-	-rm src/native/unix/config.log src/native/unix/config.status
+	-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
 
 common-configure-arch::
-	cd src/native/unix ; ./configure --with-java=$(JAVA_HOME)
+	cd src/native/unix ; ./configure --with-java=$(JAVA_HOME) --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 
 common-build-arch::
 	cd src/native/unix ; make
 
 install/lib${LIBRARY}-java::
 	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-	# NO DOCUMENTATION AT THE MOMENT
-	# -cp -a dist/docs/ debian/lib${LIBRARY}-java/usr/share/doc/lib${LIBRARY}-java/
+	# install lintian overrides
+	#install -d $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/
+	#install -m 644 $(CURDIR)/debian/kaffe-pthreads-profile.lintian $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/kaffe-pthreads-profile
+
+	



More information about the pkg-java-commits mailing list