[commons-daemon] 03/52: Imported Debian patch 1.0-4
Tony Mancill
tmancill at moszumanska.debian.org
Wed Nov 12 05:31:27 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 d0663b124b64d2b2948185e61b1d51078d73c71d
Author: Wolfgang Baer <WBaer at gmx.de>
Date: Fri Nov 12 17:48:04 2004 +0100
Imported Debian patch 1.0-4
---
debian/changelog | 14 +++++
debian/control | 86 +++++++---------------------
debian/docs | 2 +
debian/libcommons-daemon-java.links | 1 +
debian/patches/01_dist_without_javadoc.patch | 11 ----
debian/rules | 29 +++++-----
src/native/unix/Makedefs | 6 +-
7 files changed, 54 insertions(+), 95 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7346e93..91d4a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+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).
diff --git a/debian/control b/debian/control
index d806580..722f860 100644
--- a/debian/control
+++ b/debian/control
@@ -1,65 +1,39 @@
Source: commons-daemon
-Section: contrib/libs
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>> 4.0.0), sablevm, jikes, kaffe (>= 2:1.1.4), junit, cdbs, libant1.6-java, j2sdk1.4 | java2-compiler, libxerces2-java, libjaxp1.2-java
+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
Package: libcommons-daemon-java
Architecture: all
-Depends: kaffe (>= 2:1.1.4) | sablevm | gij | java2-runtime
+Depends: kaffe (>= 2:1.1.4.PRECVS12-1) | java1-runtime | java2-runtime
Recommends: jsvc
-Description: java API to launch java applications as daemons
- Having a single-point of entry is a valid solution for client
- applications, where interactively a user can command to the application
- to quit (which can terminate the Virtual Machine process at calling the
- System .exit( int ) method), but in those cases where the
- application is not interactive (server applications) there is currently
- no portable way to notify the Virtual Machine of its imminent shutdown.
+Description: Java API to launch java applications as daemons
+ The libcommons-daemon-java package can be used to implement java applications
+ which can be launched as daemons of the operating system. The application
+ has to implement the provided interfaces by this package in order to
+ be launched/stopped and restarted in the same fashion a normal unix
+ daemons.
.
- Most multi-user operating systems already have a way in which server
- applications are started and stopped, under Unix based operating
- systems non interactive server applications are called daemons and are
- controlled by the operating system with a set of specified
- signals. Under Windows such programs are called services and are
- controlled by appropriate calls to specific functions defined in the
- application binary, but although the ways of dealing with the problem
- are different, in both cases the operating system can notify a server
- application of its imminent shutdown, and the application has the
- ability to perform certain tasks before its process of execution is
- destroyed.
+ For example the java program will be notified about a shutdown and
+ therefore be able to perform tasks before its process of execution is
+ destroyed by the operation system.
.
- This is the java library, see jsvc for the application
+ This package contains the java library - you will also need the actual binary
+ for your architecture which is provided by the jsvc package.
.
This is a part of the Apache Jakarta Project.
Home: <http://jakarta.apache.org/commons/daemon/>
Package: jsvc
-Section: contrib/net
+Section: net
Architecture: any
Depends: ${shlibs:Depends}, libcommons-daemon-java
Description: native application to launch java applications as daemons
- Having a single-point of entry is a valid solution for client
- applications, where interactively a user can command to the application
- to quit (which can terminate the Virtual Machine process at calling the
- System .exit( int ) method), but in those cases where the
- application is not interactive (server applications) there is currently
- no portable way to notify the Virtual Machine of its imminent shutdown.
- .
- Most multi-user operating systems already have a way in which server
- applications are started and stopped, under Unix based operating
- systems non interactive server applications are called daemons and are
- controlled by the operating system with a set of specified
- signals. Under Windows such programs are called services and are
- controlled by appropriate calls to specific functions defined in the
- application binary, but although the ways of dealing with the problem
- are different, in both cases the operating system can notify a server
- application of its imminent shutdown, and the application has the
- ability to perform certain tasks before its process of execution is
- destroyed.
- .
- This is the native application to launch the java daemon.
+ This is the native application for launching java applications implementing
+ certain interfaces from the libcommons-daemon-java package as daemons.
.
This is a part of the Apache Jakarta Project.
Home: <http://jakarta.apache.org/commons/daemon/>
@@ -68,24 +42,6 @@ Package: jsvc-dev
Architecture: all
Depends: jsvc
Description: development files for jsvc
- Having a single-point of entry is a valid solution for client
- applications, where interactively a user can command to the application
- to quit (which can terminate the Virtual Machine process at calling the
- System .exit( int ) method), but in those cases where the
- application is not interactive (server applications) there is currently
- no portable way to notify the Virtual Machine of its imminent shutdown.
- .
- Most multi-user operating systems already have a way in which server
- applications are started and stopped, under Unix based operating
- systems non interactive server applications are called daemons and are
- controlled by the operating system with a set of specified
- signals. Under Windows such programs are called services and are
- controlled by appropriate calls to specific functions defined in the
- application binary, but although the ways of dealing with the problem
- are different, in both cases the operating system can notify a server
- application of its imminent shutdown, and the application has the
- ability to perform certain tasks before its process of execution is
- destroyed.
- .
- This is a part of the Apache Jakarta Project.
- Home: <http://jakarta.apache.org/commons/daemon/>
+ This package provides the development files of the jsvc application.
+ For a description please have a look at the packages jsvc and
+ libcommons-daemon-java.
diff --git a/debian/docs b/debian/docs
index 52020f3..7a13d00 100644
--- a/debian/docs
+++ b/debian/docs
@@ -3,3 +3,5 @@ PROPOSAL.html
README
RELEASE-NOTES.txt
STATUS.html
+src/docs/daemon.html
+dist/docs/api
diff --git a/debian/libcommons-daemon-java.links b/debian/libcommons-daemon-java.links
new file mode 100644
index 0000000..49bf518
--- /dev/null
+++ b/debian/libcommons-daemon-java.links
@@ -0,0 +1 @@
+usr/share/java/commons-daemon-1.0.jar usr/share/java/commons-daemon.jar
diff --git a/debian/patches/01_dist_without_javadoc.patch b/debian/patches/01_dist_without_javadoc.patch
deleted file mode 100644
index 42a7056..0000000
--- a/debian/patches/01_dist_without_javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig 2004-10-09 17:53:58.698052672 +0200
-+++ build.xml 2004-10-09 17:57:13.151491256 +0200
-@@ -201,7 +201,7 @@
- </target>
-
-
-- <target name="dist" depends="compile,javadoc"
-+ <target name="dist" depends="compile"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/lib"/>
diff --git a/debian/rules b/debian/rules
index 5253d07..8f72eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,32 +7,29 @@
# This is the debhelper compatibility version to use.
#export DH_COMPAT=4
-# this is for my IBM ppc's JDK
-export JITC_PROCESSOR_TYPE=6
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/j2se/1.4
+JAVA_HOME := /usr/lib/kaffe
ANT_HOME := /usr/share/ant1.6
-DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar jaxp-1.2 xercesImpl
+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
-install/lib${LIBRARY}-java::
- install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
- echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}-java.links
-# NO DOCUMENTATION AT THE MOMENT
-# -cp -a dist/docs/ debian/lib${LIBRARY}-java/usr/share/doc/lib${LIBRARY}-java/
-
-install/jsvc::
- cd src/native/unix ; ./configure --with-java=$(JAVA_HOME) ; make
-
clean::
- -rm debian/lib${LIBRARY}-java.links
-(cd src/native/unix ; make clean)
-rm src/native/unix/config.log src/native/unix/config.status
+
+common-configure-arch::
+ cd src/native/unix ; ./configure --with-java=$(JAVA_HOME)
+
+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/
diff --git a/src/native/unix/Makedefs b/src/native/unix/Makedefs
index 13b929a..79ad658 100644
--- a/src/native/unix/Makedefs
+++ b/src/native/unix/Makedefs
@@ -59,9 +59,9 @@
# @version $Id: Makedefs.in,v 1.1.1.1 2003/09/04 23:28:20 yoavs Exp $
CC = gcc
-JAVAC = /usr/lib/j2se/1.4/bin/javac
-JAR = /usr/lib/j2se/1.4/bin/jar
-CFLAGS = -g -O2 -DCPU=\"powerpc\" -DOS_LINUX -DDSO_DLFCN -I/usr/lib/j2se/1.4/include -I/usr/lib/j2se/1.4/include/linux -Wall -Wstrict-prototypes
+JAVAC = /usr/lib/kaffe/bin/javac
+JAR = /usr/lib/kaffe/bin/jar
+CFLAGS = -g -O2 -DCPU=\"i386\" -DOS_LINUX -DDSO_DLFCN -I/usr/lib/kaffe/include -I/usr/lib/kaffe/include/linux -Wall -Wstrict-prototypes
LDFLAGS = -ldl
JAVACFLAGS =
RANLIB = ranlib
--
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