[commons-daemon] 21/52: Imported Debian patch 1.0.2-1
Tony Mancill
tmancill at moszumanska.debian.org
Wed Nov 12 05:31:29 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 e0ef59b3dc1cde0505c35907c548898a1f6d774b
Merge: e650ebc faaf629
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Tue Jul 27 21:39:41 2010 +0200
Imported Debian patch 1.0.2-1
KEYS | 51 -
NOTICE.txt | 3 +
PROPOSAL.html | 18 +-
README | 25 +-
RELEASE-NOTES.txt | 13 +-
STATUS.html | 74 -
build-maven.xml | 204 -
build.properties.sample | 16 +
build.xml | 124 +-
debian/changelog | 29 +
debian/control | 17 +-
debian/copyright | 2 +-
debian/jsvc.dirs | 1 -
debian/libcommons-daemon-java.dirs | 1 -
debian/libcommons-daemon-java.doc-base | 4 +-
debian/libcommons-daemon-java.docs | 2 +-
debian/patches/series | 1 +
debian/patches/sh4-support.diff | 18 +
debian/rules | 123 +-
debian/source/format | 1 +
debian/watch | 3 +-
doap_daemon.rdf | 29 -
maven.xml | 36 -
pom.xml | 133 +
project.properties | 24 -
project.xml | 137 -
src/assembly/bin.xml | 45 +
src/assembly/native-src.xml | 72 +
src/assembly/src.xml | 42 +
src/conf/MANIFEST.MF | 5 -
src/docs/daemon.css | 17 +
src/docs/daemon.html | 16 +
src/java/org/apache/commons/daemon/Daemon.java | 19 +-
.../org/apache/commons/daemon/DaemonContext.java | 15 +-
.../apache/commons/daemon/DaemonController.java | 15 +-
.../org/apache/commons/daemon/DaemonListener.java | 11 +-
.../apache/commons/daemon/DaemonPermission.java | 15 +-
.../commons/daemon/support/DaemonLoader.java | 14 +-
src/native/nt/executables/vdmoniadm/resource.h | 13 +-
src/native/nt/executables/vdmonisvc/resource.h | 13 +-
src/native/nt/lib/moni_inst.h | 11 +-
src/native/nt/moni/vdmoniadm.c | 487 +-
src/native/nt/moni/vdmonisvc.c | 73 +-
src/native/nt/procrun/LICENSE | 287 --
src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c | 1705 -------
src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.dsp | 173 -
src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h | 117 -
.../nt/procrun/apps/apsvcmgr/apsvcmgr.manifest | 10 -
src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc | 312 --
.../nt/procrun/apps/apsvcmgr/apsvcmgr.vcproj | 404 --
src/native/nt/procrun/apps/jar2exe/jar2exe.c | 542 ---
src/native/nt/procrun/apps/jar2exe/jar2exe.h | 86 -
src/native/nt/procrun/apps/jar2exe/jar2exe.rc | 55 -
src/native/nt/procrun/apps/jar2exe/jar2exe.vcproj | 145 -
src/native/nt/procrun/apps/prunmgr/prunmgr.amd64 | 110 +
src/native/nt/procrun/apps/prunmgr/prunmgr.c | 417 +-
src/native/nt/procrun/apps/prunmgr/prunmgr.dsp | 35 +-
src/native/nt/procrun/apps/prunmgr/prunmgr.h | 15 +-
src/native/nt/procrun/apps/prunmgr/prunmgr.ia64 | 110 +
.../nt/procrun/apps/prunmgr/prunmgr.manifest | 6 +-
src/native/nt/procrun/apps/prunmgr/prunmgr.rc | 38 +-
src/native/nt/procrun/apps/prunmgr/prunmgr.x86 | 110 +
src/native/nt/procrun/apps/prunsrv/prunsrv.amd64 | 109 +
src/native/nt/procrun/apps/prunsrv/prunsrv.c | 617 ++-
src/native/nt/procrun/apps/prunsrv/prunsrv.dsp | 16 +-
src/native/nt/procrun/apps/prunsrv/prunsrv.h | 13 +-
src/native/nt/procrun/apps/prunsrv/prunsrv.ia64 | 109 +
src/native/nt/procrun/apps/prunsrv/prunsrv.rc | 22 +-
src/native/nt/procrun/apps/prunsrv/prunsrv.x86 | 109 +
src/native/nt/procrun/apps/srvbatch/MSG00001.bin | Bin 84 -> 0 bytes
.../nt/procrun/apps/srvbatch/example/example.c | 59 -
.../procrun/apps/srvbatch/example/example.vcproj | 132 -
.../nt/procrun/apps/srvbatch/example/exservice.bat | 53 -
src/native/nt/procrun/apps/srvbatch/srvbatch.c | 827 ----
src/native/nt/procrun/apps/srvbatch/srvbatch.rc | 58 -
src/native/nt/procrun/apps/srvbatch/srvbatch.sln | 30 -
.../nt/procrun/apps/srvbatch/srvbatch.vcproj | 135 -
src/native/nt/procrun/include/apxwin.h | 19 +-
src/native/nt/procrun/include/cmdline.h | 11 +-
src/native/nt/procrun/include/console.h | 11 +-
src/native/nt/procrun/include/gui.h | 11 +-
src/native/nt/procrun/include/handles.h | 11 +-
src/native/nt/procrun/include/javajni.h | 22 +-
src/native/nt/procrun/include/log.h | 11 +-
src/native/nt/procrun/include/registry.h | 17 +-
src/native/nt/procrun/include/rprocess.h | 11 +-
src/native/nt/procrun/include/service.h | 13 +-
src/native/nt/procrun/java/Test.java | 34 -
src/native/nt/procrun/libprocrun.amd64 | 158 +
src/native/nt/procrun/libprocrun.dsp | 10 +-
src/native/nt/procrun/libprocrun.ia64 | 158 +
src/native/nt/procrun/libprocrun.x86 | 158 +
src/native/nt/procrun/resources/apsvcmgr.ico | Bin 7406 -> 0 bytes
src/native/nt/procrun/resources/commons.bmp | Bin 0 -> 25462 bytes
src/native/nt/procrun/resources/jakarta.bmp | Bin 25462 -> 0 bytes
src/native/nt/procrun/resources/license.rtf | 2 +-
src/native/nt/procrun/resources/sorterd.bmp | Bin 190 -> 0 bytes
src/native/nt/procrun/resources/sorteru.bmp | Bin 190 -> 0 bytes
src/native/nt/procrun/resources/sstatus.bmp | Bin 630 -> 0 bytes
src/native/nt/procrun/resources/toolbar.bmp | Bin 2294 -> 0 bytes
src/native/nt/procrun/samples/cchild.c | 133 -
src/native/nt/procrun/samples/cchild.vcproj | 227 -
src/native/nt/procrun/src/cmdline.c | 44 +-
src/native/nt/procrun/src/console.c | 11 +-
src/native/nt/procrun/src/gui.c | 15 +-
src/native/nt/procrun/src/handles.c | 20 +-
src/native/nt/procrun/src/javajni.c | 355 +-
src/native/nt/procrun/src/log.c | 127 +-
src/native/nt/procrun/src/mclib.c | 144 +-
src/native/nt/procrun/src/mclib.h | 11 +-
src/native/nt/procrun/src/private.h | 11 +-
src/native/nt/procrun/src/registry.c | 212 +-
src/native/nt/procrun/src/rprocess.c | 38 +-
src/native/nt/procrun/src/service.c | 48 +-
src/native/nt/procrun/src/utils.c | 166 +-
src/native/nt/procrun/testchild/testchild.c | 79 -
src/native/nt/procrun/testchild/testchild.dsp | 106 -
src/native/nt/procrun/testchild/testchild.vcproj | 120 -
src/native/nt/procrun/xdocs/index.xml | 15 +
src/native/nt/service/instmain.c | 13 +-
src/native/nt/signals/kills.c | 13 +-
src/native/nt/supcalls_nt/vdenv.c | 29 +-
src/native/unix/CHANGES.txt | 30 +-
src/native/unix/INSTALL.txt | 22 +
src/native/unix/Makedefs | 32 +
src/native/unix/Makedefs.in | 25 +-
src/native/unix/Makefile | 40 +
src/native/unix/Makefile.in | 25 +-
src/native/unix/config.guess | 1533 -------
src/native/unix/config.log | 264 ++
src/native/unix/config.status | 866 ++++
src/native/unix/config.sub | 1693 -------
src/native/unix/configure | 4663 ++++++++++++++++++++
src/native/unix/configure.in | 14 +-
src/native/unix/man/fetch.sh | 15 +
src/native/unix/man/jsvc.1.xml | 30 +-
src/native/unix/native/Makefile | 45 +
src/native/unix/native/Makefile.in | 30 +-
src/native/unix/native/Tomcat.sh | 23 +-
src/native/unix/native/Tomcat5.sh | 23 +-
src/native/unix/native/arguments.c | 29 +-
src/native/unix/native/arguments.h | 15 +-
src/native/unix/native/arguments.o | Bin 0 -> 20372 bytes
src/native/unix/native/debug.c | 38 +-
src/native/unix/native/debug.h | 13 +-
src/native/unix/native/debug.o | Bin 0 -> 6956 bytes
src/native/unix/native/dso-dlfcn.c | 17 +-
src/native/unix/native/dso-dlfcn.o | Bin 0 -> 5616 bytes
src/native/unix/native/dso-dyld.c | 13 +-
src/native/unix/native/dso-dyld.o | Bin 0 -> 3388 bytes
src/native/unix/native/dso.h | 23 +-
src/native/unix/native/help.c | 20 +-
src/native/unix/native/help.h | 19 +-
src/native/unix/native/help.o | Bin 0 -> 8512 bytes
src/native/unix/native/home.c | 13 +-
src/native/unix/native/home.h | 13 +-
src/native/unix/native/home.o | Bin 0 -> 14068 bytes
src/native/unix/native/java.c | 35 +-
src/native/unix/native/java.h | 18 +-
src/native/unix/native/java.o | Bin 0 -> 39660 bytes
src/native/unix/native/jsvc-unix.c | 241 +-
src/native/unix/native/jsvc-unix.o | Bin 0 -> 30668 bytes
src/native/unix/native/jsvc.h | 21 +-
src/native/unix/native/libservice.a | Bin 0 -> 113450 bytes
src/native/unix/native/location.c | 13 +-
src/native/unix/native/location.h | 19 +-
src/native/unix/native/location.o | Bin 0 -> 5980 bytes
src/native/unix/native/{dso.h => locks.c} | 38 +-
src/native/unix/native/locks.h | 39 +
src/native/unix/native/locks.o | Bin 0 -> 857 bytes
src/native/unix/native/replace.c | 13 +-
src/native/unix/native/replace.h | 13 +-
src/native/unix/native/replace.o | Bin 0 -> 6004 bytes
src/native/unix/native/signals.c | 21 +-
src/native/unix/native/{dso.h => signals.h} | 25 +-
src/native/unix/native/signals.o | Bin 0 -> 859 bytes
src/native/unix/native/version.h | 63 +
src/native/unix/support/apfunctions.m4 | 13 +-
src/native/unix/support/apjava.m4 | 13 +-
src/native/unix/support/apsupport.m4 | 50 +-
src/native/unix/support/buildconf.sh | 28 +-
src/native/unix/support/install.sh | 23 +-
src/samples/AloneDaemon.sh | 26 +-
src/samples/AloneService.java | 17 +-
src/samples/Native.c | 20 +-
src/samples/Native.sh | 12 +-
src/samples/README.txt | 2 +-
src/samples/ServiceDaemon.java | 17 +-
src/samples/ServiceDaemon.sh | 26 +-
src/samples/ServiceDaemonReadThread.java | 13 +-
src/samples/SimpleDaemon.java | 13 +-
src/samples/SimpleDaemon.sh | 24 +-
src/samples/build.xml | 17 +
{xdocs => src/site/resources}/images/logo.gif | Bin
{xdocs => src/site/resources}/images/logo.png | Bin
src/site/site.xml | 45 +
src/site/xdoc/binaries.xml | 65 +
src/site/xdoc/download_daemon.xml | 145 +
{xdocs => src/site/xdoc}/faq.xml | 16 +
{xdocs => src/site/xdoc}/index.xml | 52 +-
src/site/xdoc/issue-tracking.xml | 102 +
{xdocs => src/site/xdoc}/jsvc.xml | 99 +-
{xdocs => src/site/xdoc}/procrun.xml | 45 +-
.../org/apache/commons/daemon/SimpleDaemon.java | 15 +-
xdocs/binaries.xml | 49 -
xdocs/navigation.xml | 33 -
xdocs/style/project.css | 5 -
207 files changed, 10871 insertions(+), 11791 deletions(-)
diff --cc debian/changelog
index 015422c,0000000..6dd2edf
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,166 -1,0 +1,195 @@@
++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 50ce8d1,0000000..43807cf
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -1,0 +1,36 @@@
+Source: commons-daemon
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>
- Build-Depends: debhelper (>= 7), autoconf, autotools-dev, java-gcj-compat-dev, xsltproc, docbook-xsl, ant
++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
+Build-Conflicts: autoconf2.13
- Standards-Version: 3.8.3
- Homepage: http://jakarta.apache.org/commons/daemon/
- Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon
++Standards-Version: 3.9.1
++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: java-gcj-compat | java1-runtime | java2-runtime
++Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Suggests: java-virtual-machine
+Recommends: jsvc
+Description: library to launch Java applications as daemons
- The Daemon package from Jakarta Commons can be used to implement Java
++ 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: ${shlibs:Depends}, libcommons-daemon-java
++Depends: ${misc:Depends}, ${shlibs:Depends}, libcommons-daemon-java
+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 adc7518,0000000..207ec73
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,30 -1,0 +1,30 @@@
+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://jakarta.apache.org/commons/daemon>.
++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'.
diff --cc debian/libcommons-daemon-java.doc-base
index f24f93e,0000000..b986d92
mode 100644,000000..100644
--- a/debian/libcommons-daemon-java.doc-base
+++ b/debian/libcommons-daemon-java.doc-base
@@@ -1,9 -1,0 +1,9 @@@
+Document: libcommons-daemon-java
+Title: API Javadoc for commons-daemon
+Author: commons-daemon developers
+Abstract: This is the API Javadoc provided by the commons-daemon library.
+Section: Programming
+
+Format: HTML
- Index: /usr/share/doc/libcommons-daemon-java/apidocs/index.html
- Files: /usr/share/doc/libcommons-daemon-java/apidocs/*
++Index: /usr/share/doc/libcommons-daemon-java/api/index.html
++Files: /usr/share/doc/libcommons-daemon-java/api/*
diff --cc debian/libcommons-daemon-java.docs
index 7b27609,0000000..7f8a2c4
mode 100644,000000..100644
--- a/debian/libcommons-daemon-java.docs
+++ b/debian/libcommons-daemon-java.docs
@@@ -1,4 -1,0 +1,4 @@@
+PROPOSAL.html
- STATUS.html
++RELEASE-NOTES.txt
+src/docs/daemon.html
+dist/docs/api
diff --cc debian/patches/series
index 0000000,0000000..a4197af
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++sh4-support.diff
diff --cc debian/patches/sh4-support.diff
index 0000000,0000000..a16bcb9
new file mode 100644
--- /dev/null
+++ b/debian/patches/sh4-support.diff
@@@ -1,0 -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"]);;
diff --cc debian/rules
index 2dd13d5,0000000..2d1021f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,128 -1,0 +1,53 @@@
+#!/usr/bin/make -f
+
+CFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
- JAVA_HOME := /usr/lib/jvm/java-gcj
- DEB_JARS_BASE := /usr/share/java
- JAVACMD := $(JAVA_HOME)/bin/java
-
- DEB_JARS := ant ant-launcher
-
- 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)
-
- ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(ANT_ARGS)
++JAVA_HOME := /usr/lib/jvm/default-java
++ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+
+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
- DOCDIR := $(INSTALLDIR)/usr/share/doc/lib$(PKGNAME)-java
- VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\~)
++JAVALIBDIR := /usr/share/java
++VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+NATIVE_SRC := src/native/unix
+
++# Keep that here as dh7 doesn't handle a configure script inside a subdirectory
+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)
++ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
++ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
- $(NATIVE_SRC)/configure: $(NATIVE_SRC)/configure.in
- cd $(NATIVE_SRC); autoconf
++%:
++ dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev
+
- config-stamp: $(NATIVE_SRC)/configure
- dh_testdir
- cd $(NATIVE_SRC); touch install-sh; \
- ./configure $(confflags) CFLAGS="$(CFLAGS)" --with-java=$(JAVA_HOME)
- touch config-stamp
++override_dh_auto_configure:
++ (cd $(NATIVE_SRC); autoconf; ./configure $(confflags) CFLAGS="$(CFLAGS)" --with-java=$(JAVA_HOME))
+
- build: build-arch build-indep
-
- build-arch: build-arch-stamp
- build-arch-stamp: config-stamp
- dh_testdir
- $(MAKE) -C $(NATIVE_SRC)
++override_dh_auto_build:
++ JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS)
++ dh_auto_build --sourcedirectory=$(NATIVE_SRC)
+ $(XSLTPROC) $(MAN_STYLESHEET) $(NATIVE_SRC)/man/jsvc.1.xml
- 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 jsvc.1
- rm -rf target dist
- -(cd src/native/unix ; make clean)
- -rm -f src/native/unix/config.log src/native/unix/config.status src/native/unix/configure
- -rm -f src/native/unix/Makefile src/native/unix/Makedefs src/native/unix/native/Makefile src/native/unix/install-sh
- cp -f /usr/share/misc/config.sub $(NATIVE_SRC)/config.sub
- cp -f /usr/share/misc/config.guess $(NATIVE_SRC)/config.guess
- dh_clean
-
- install: install-arch install-indep
-
- install-indep: build-indep
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
- 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
- dh_testdir
- dh_testroot
- dh_prep -a
- dh_installdirs -a
- dh_install -a
- dh_installdocs -a
- dh_installman -a
-
- binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- 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
++override_dh_auto_clean:
++ JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS) clean
++ dh_auto_clean
++ rm -f jsvc.1
+
- binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
++override_dh_auto_install:
++ dh_auto_install
++ dh_install -plib$(PKGNAME)-java dist/$(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)
++ dh_link -plib$(PKGNAME)-java $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
+
- binary: binary-indep binary-arch
- .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-arch install-indep
++get-orig-source:
++ uscan --force-download --rename
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 5d7b698,0000000..b5f358f
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
+version=3
- opts="dversionmangle=s/1.0.2\~svn.*$/1.0.1/" \
- http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-(.*)\.tar\.gz
++http://www.apache.org/dist/commons/daemon/source/commons-daemon-([\d\.]+)-src\.tar\.gz
--
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