[commons-daemon] 32/52: Imported Debian patch 1.0.6-1
Tony Mancill
tmancill at moszumanska.debian.org
Wed Nov 12 05:31:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository commons-daemon.
commit 34d539f036134f7daffa47180b716e80cd6b08f9
Merge: 01525b1 c816c0a
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Jul 10 22:06:40 2011 +0200
Imported Debian patch 1.0.6-1
RELEASE-NOTES.txt | 17 +-
build.xml | 6 +-
debian/changelog | 10 +
debian/control | 3 +-
debian/copyright | 51 +-
debian/patches/libgcj_PR31700.diff | 2 +-
debian/patches/sh4_support.diff | 6 +-
pom.xml | 9 +-
.../apache/commons/daemon/DaemonUserSignal.java | 39 +
.../daemon/support/DaemonConfiguration.java | 2 +-
.../commons/daemon/support/DaemonLoader.java | 26 +-
src/native/unix/CHANGES.txt | 6 +-
src/native/unix/configure | 4648 +++++++++-----------
src/native/unix/man/jsvc.1.xml | 24 +-
src/native/unix/native/arguments.c | 8 +-
src/native/unix/native/help.c | 7 +-
src/native/unix/native/java.c | 27 +-
src/native/unix/native/java.h | 3 +-
src/native/unix/native/jsvc-unix.c | 104 +-
src/native/unix/native/version.h | 2 +-
src/native/unix/support/apsupport.m4 | 6 +-
src/native/unix/support/config.guess | 0
src/native/unix/support/config.sub | 0
src/native/windows/README.dev | 38 +
src/native/windows/apps/prunmgr/prunmgr.c | 1 -
src/native/windows/apps/prunmgr/prunmgr.h | 2 +-
src/native/windows/apps/prunmgr/prunmgr.rc | 6 +-
src/native/windows/apps/prunsrv/prunsrv.c | 187 +-
src/native/windows/apps/prunsrv/prunsrv.h | 2 +-
src/native/windows/apps/prunsrv/prunsrv.rc | 4 +-
src/native/windows/include/apxwin.h | 2 +
src/native/windows/include/javajni.h | 1 +
src/native/windows/src/cmdline.c | 58 +-
src/native/windows/src/javajni.c | 7 +-
src/native/windows/src/private.h | 1 -
src/native/windows/src/service.c | 7 +-
src/native/windows/src/utils.c | 25 +
src/samples/Tomcat5.sh | 4 +-
src/samples/Tomcat7.sh | 36 +-
.../org/apache/commons/daemon/SimpleDaemon.java | 31 +-
40 files changed, 2578 insertions(+), 2840 deletions(-)
diff --cc debian/changelog
index 89c1592,0000000..579d79d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,246 -1,0 +1,256 @@@
++commons-daemon (1.0.6-1) unstable; urgency=low
++
++ * New upstream release.
++ * Refresh patches.
++ * d/control: Move Depends default-jre-headless | java2-runtime-headless from
++ libcommons-daemon-java to jsvc package Recommends.
++ * d/copyright: Use DEP-5 format.
++
++ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 10 Jul 2011 22:06:40 +0200
++
+commons-daemon (1.0.5-2) unstable; urgency=low
+
+ * Publish commons daemon JAR into /usr/share/maven-repo.
+ * d/control: Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 13 Jun 2011 19:25:17 +0200
+
+commons-daemon (1.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 05 Jan 2011 22:01:53 +0100
+
+commons-daemon (1.0.4-1) unstable; urgency=low
+
+ * New upstream release.
+ - d/patches/syslog.diff: merged upstream.
+ - d/patches/jsvc_reopen_usr1.diff: merged upstream.
+ - d/patches/hurd_support.diff: use "gnu" instead of "hurd".
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 21 Nov 2010 18:05:41 +0100
+
+commons-daemon (1.0.3-2) UNRELEASED; urgency=low
+
+ * d/patches/jsvc_reopen_usr1.diff:
+ Make jsvc reopen log files on SIGUSR1 (Closes: #460183).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 31 Aug 2010 00:26:47 +0200
+
+commons-daemon (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/old_capabilities.diff: merged upstream.
+ - no more prebuilt ELF objects in source tarball.
+ * d/pacthes/syslog.diff: Updated to keep timestamp when SYSLOG support
+ is not enabled.
+ * d/patches/hurd_support.diff: tentative support for GNU/Hurd OS.
+ * d/control: B-D on libcap-dev for all Linux OS.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 05 Aug 2010 18:00:06 +0200
+
+commons-daemon (1.0.2-2) unstable; urgency=low
+
+ * Re-add missing patches (lost during merge of new upstream release):
+ - debian/patches/syslog.diff: Support for logging to syslog.
+ - debian/patches/old_capabilities.diff: Work with older Linux capabilities.
+ - debian/patches/libgcj_PR31700.diff: Bug in GCJ handling of -X options.
+ - debian/patches/*_support.diff: Support for other Debian architectures.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 28 Jul 2010 14:59:18 +0200
+
+commons-daemon (1.0.2-1) unstable; urgency=low
+
+ [ Thierry Carrez ]
+ * debian/control, debian/rules: Build with default-jdk
+ * debian/rules: Depend on -headless runtimes
+ * debian/rules: Set java source/target to 1.4 to match depends
+
+ [ Torsten Werner ]
+ * Re-add changes made by Emmanuel Bourg:
+ - Update of the URLs
+ - Rename Jakarta Commons to Apache Commons
+
+ [ Damien Raude-Morvan ]
+ * New upstream stable release (Closes: #578661).
+ - d/watch: Update URL for new upstream release.
+ * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
+ * d/control: Remove Arnaud and add myself from Uploaders.
+ * Updated to Standards-Version 3.9.1:
+ - d/control: Add recommended get-orig-source target.
+ * d/control: Add ${misc:Depends} to Depends.
+ * Switch to 3.0 (quilt) format.
+ * Use Debhelper 7:
+ - d/rules: Use dh 7 and cleanup our rules file.
+ - d/*.dirs: Removed not needed anymore.
+ * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
+ /usr/share/doc/libcommons-daemon-java/api.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 21:39:41 +0200
+
+commons-daemon (1.0.2~svn20061127-10) unstable; urgency=low
+
+ * Build-Depends on libcap2-dev (Closes: #506548).
+ * Added kfreebsd-* support to src/native/unix/support/apsupport.m4
+ (Closes: #498376).
+ * Point stdout and stderr to /dev/null for the daemon process
+ (Closes: #491500, #507968).
+ * Build-Depends on debhelper >= 7.
+ * Replace dh_clean -k with dh_prep.
+ * Moved package to section 'java'.
+ * Rewrote debian/copyright to refer to
+ /usr/share/common-licenses/Apache-2.0.
+ * Updated to Standards-Version 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 17 Sep 2009 22:54:55 +0200
+
+commons-daemon (1.0.2~svn20061127-9) unstable; urgency=low
+
+ * Added patch to handle old capabilities version in jsvc-unix.c.
+ Closes: #412690
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 07 May 2008 20:03:55 +0200
+
+commons-daemon (1.0.2~svn20061127-8) unstable; urgency=low
+
+ * Clean src/native/unix/configure. Closes: #478503
+ * Put jsvc into section utils.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 30 Apr 2008 05:12:17 -0100
+
+commons-daemon (1.0.2~svn20061127-7) unstable; urgency=low
+
+ * Updated watch file.
+ * Updated Standards-Version to 3.7.3.
+ * Remove bashism in debian/rules. (Closes: #478365).
+ * Build-Depend on default-jdk-builddep. (Closes: #477853).
+ * Renamed XS-Vcs-* fields to Vcs-*.
+ * Added Homepage field.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 29 Apr 2008 04:40:33 -0100
+
+commons-daemon (1.0.2~svn20061127-6) unstable; urgency=low
+
+ * Applied a workaround for a JNI bug in libgcj (see
+ http://gcc.gnu.org/PR31700).
+
+ -- Marcus Better <marcus at better.se> Wed, 25 Apr 2007 15:11:01 +0200
+
+commons-daemon (1.0.2~svn20061127-5) unstable; urgency=low
+
+ * jsvc can now redirect daemon output to syslog. (Closes: #402878)
+ * Added support for the ppc64 architecture. Thanks to Andreas
+ Jochens. (Closes: #404704)
+ * Print a useful error message if the capabilities module is
+ missing. Thanks to Adrian Bridgett. (Closes: #412478)
+ * Don't use included config.sub and config.guess.
+
+ -- Marcus Better <marcus at better.se> Wed, 13 Dec 2006 15:09:58 +0100
+
+commons-daemon (1.0.2~svn20061127-4) unstable; urgency=low
+
+ * Apparently buildds don't grok Build-Depends-Indep. Moved to
+ Build-Depends as a workaround.
+
+ -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 14:29:08 +0100
+
+commons-daemon (1.0.2~svn20061127-3) unstable; urgency=low
+
+ * Build-depend on java-gcj-compat-dev instead of Build-depend-indep.
+
+ -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 12:50:35 +0100
+
+commons-daemon (1.0.2~svn20061127-2) unstable; urgency=low
+
+ * Build-depend on autoconf instead of Build-depend-indep.
+
+ -- Marcus Better <marcus at better.se> Thu, 30 Nov 2006 09:39:54 +0100
+
+commons-daemon (1.0.2~svn20061127-1) unstable; urgency=low
+
+ * Support the arm, hppa, ia64, m68k, mipsel, and s390
+ architectures. (Closes: #307853)
+ * Don't include irrelevant README. (Closes: #394169)
+ * The jsvc-dev package is no longer built as it's not useful.
+ * debian/control:
+ - Fix build deps: remove libxerces2-java and libjaxp1.2-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
+
+commons-daemon (1.0.1-3) unstable; urgency=low
+
+ * Apply a patch to support ppc64 arch, thanks to Andreas Jochens
+ (closes: #361831)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 3 Jul 2006 11:04:55 +0200
+
+commons-daemon (1.0.1-2) unstable; urgency=low
+
+ * (Builds-)Depends on java-gcj-compat(-dev) instead of kaffe(-dev)
+ (Closes: #358343).
+ * Update Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 1 Jul 2006 15:56:17 +0000
+
+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.
+ * Build with free tools now, therefore buildable on all
+ architectures and a jsvc binary should be provided (closes: #286871)
+ * Move to main as built with free tools
+ * Shortened and clarified description (closes: #279752)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sun, 10 Apr 2005 23:31:38 +0200
+
+commons-daemon (1.0-4) unstable; urgency=low
+
+ * Build with free tools now, therefore buildable on all
+ architectures and a jsvc binary should be provided (closes: #286871)
+ * Moved configure/build of jsvc binary from install/jsvc target to the
+ common-configure-arch and common-build-arch targets
+ * Move to main as built with free tools
+ * Shortened and clarified description (closes: #279752)
+ * Build javadoc api and include daemons.html into documentation
+ (Removed patch 01_dist_without_javadoc.patch)
+ * avdyk: added Wolfgang to the uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 12 Nov 2004 17:48:04 +0100
+
+commons-daemon (1.0-3) unstable; urgency=low
+
+ * changed build-dep-indep to build-dep (closes: #280933).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 12 Nov 2004 17:48:04 +0100
+
+commons-daemon (1.0-2) unstable; urgency=low
+
+ * improved description for jsvc-dev.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 29 Oct 2004 11:57:53 +0200
+
+commons-daemon (1.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 9 Oct 2004 17:51:44 +0200
+
diff --cc debian/control
index 61b5eb2,0000000..d9d07b1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,37 -1,0 +1,38 @@@
+Source: commons-daemon
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), autoconf, autotools-dev, default-jdk,
+ xsltproc, docbook-xsl, ant, libcap-dev [linux-any], maven-repo-helper
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.9.2
+Homepage: http://commons.apache.org/daemon/
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/
+
+Package: libcommons-daemon-java
+Architecture: all
- Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
++Depends: ${misc:Depends}
+Suggests: java-virtual-machine
+Recommends: jsvc
+Description: library to launch Java applications as daemons
+ The Daemon package from Apache Commons can be used to implement Java
+ applications which can be launched as daemons. For example the
+ program will be notified about a shutdown so that it can perform
+ cleanup tasks before its process of execution is destroyed by the
+ operation system.
+ .
+ This package contains the java library. You will also need the actual
+ binary for your architecture which is provided by the jsvc package.
+
+Package: jsvc
+Section: utils
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, libcommons-daemon-java
++Recommends: default-jre-headless | java2-runtime-headless
+Description: wrapper to launch Java applications as daemons
+ This is the native application for launching Java applications
+ implementing certain interfaces from the libcommons-daemon-java
+ package as daemons.
diff --cc debian/copyright
index 207ec73,0000000..8d67ba7
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,30 -1,0 +1,21 @@@
- This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
- Sam, 09 Oct 2004 17:46:48 +0200.
-
- It was downloaded from <http://commons.apache.org/daemon>.
-
- Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk, Remy
- Maucherat, Pier Fumagalli, Yoav Shapira.
-
- commons-daemon is Copyright (C) 1999-2005 The Apache Software
- Foundation.
-
- The Debian packaging is Copyright (C) 2006 Marcus Better (and others)
- and licensed under the same license as commons-daemon itself.
-
- License:
-
- 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.
-
- On Debian system you can find the complete text of the Apache License,
- Version 2, in the file '/usr/share/common-licenses/Apache-2.0'.
++Format: http://dep.debian.net/deps/dep5/
++Upstream-Name: Commons Daemon
++Upstream-Contact: <http://commons.apache.org/daemon>
++Source: http://www.apache.org/dist/commons/daemon/source/
++
++Files: *
++Copyright: Copyright (C) 1999-2011 The Apache Software Foundation.
++License: Apache-2.0
++Comment:
++ Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk,
++ Remy Maucherat, Pier Fumagalli, Yoav Shapira.
++
++Files: debian/*
++Copyright: 2004, Arnaud Vandyck <avdyk at debian.org>
++Copyright: Copyright (C) 2006 Marcus Better
++Copyright: 2010-2011, Damien Raude-Morvan
++License: Apache-2.0
++
++License: Apache-2.0
++ A complete copy of the Apache License, Version 2.0, can be found in
++ /usr/share/common-licenses/Apache-2.0 on Debian Systems.
diff --cc debian/patches/libgcj_PR31700.diff
index a69bead,0000000..f8c1e38
mode 100644,000000..100644
--- a/debian/patches/libgcj_PR31700.diff
+++ b/debian/patches/libgcj_PR31700.diff
@@@ -1,15 -1,0 +1,15 @@@
+Description: Workaround for libgcj/PR31700 in handling -X options.
+Bug: vendor, http://gcc.gnu.org/PR31700
+Author: Marcus Better <marcus at better.se>
+Last-Update: 2010-07-28
+--- a/src/native/unix/native/java.c
++++ b/src/native/unix/native/java.c
- @@ -227,7 +227,7 @@
++@@ -252,7 +252,7 @@
+ return false;
+ }
+ #endif
+- arg.ignoreUnrecognized = FALSE;
++ arg.ignoreUnrecognized = JNI_TRUE;
+ arg.nOptions = args->onum + 4; /* pid, ppid and abort */
+ opt = (JavaVMOption *) malloc(arg.nOptions * sizeof(JavaVMOption));
+ for (x = 0; x < args->onum; x++) {
diff --cc debian/patches/sh4_support.diff
index a16bcb9,0000000..b8b949c
mode 100644,000000..100644
--- a/debian/patches/sh4_support.diff
+++ b/debian/patches/sh4_support.diff
@@@ -1,18 -1,0 +1,18 @@@
+Description: support Renesas SH4
+Bug: http://bugs.debian.org/564166
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-27
+Forwarded: no
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -122,6 +122,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ sh*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
- *)
- AC_MSG_RESULT([failed])
- AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
++ arm*)
++ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
++ supported_os="arm"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git
More information about the pkg-java-commits
mailing list