[pkg-java] r13842 - in trunk/commons-daemon/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Jul 10 20:09:13 UTC 2011
Author: drazzib
Date: 2011-07-10 20:09:13 +0000 (Sun, 10 Jul 2011)
New Revision: 13842
Modified:
trunk/commons-daemon/debian/changelog
trunk/commons-daemon/debian/control
trunk/commons-daemon/debian/copyright
trunk/commons-daemon/debian/patches/libgcj_PR31700.diff
trunk/commons-daemon/debian/patches/sh4_support.diff
Log:
* 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.
Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog 2011-07-07 04:02:04 UTC (rev 13841)
+++ trunk/commons-daemon/debian/changelog 2011-07-10 20:09:13 UTC (rev 13842)
@@ -1,3 +1,13 @@
+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.
Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control 2011-07-07 04:02:04 UTC (rev 13841)
+++ trunk/commons-daemon/debian/control 2011-07-10 20:09:13 UTC (rev 13842)
@@ -14,7 +14,7 @@
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
@@ -31,6 +31,7 @@
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
Modified: trunk/commons-daemon/debian/copyright
===================================================================
--- trunk/commons-daemon/debian/copyright 2011-07-07 04:02:04 UTC (rev 13841)
+++ trunk/commons-daemon/debian/copyright 2011-07-10 20:09:13 UTC (rev 13842)
@@ -1,30 +1,21 @@
-This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
-Sam, 09 Oct 2004 17:46:48 +0200.
+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/
-It was downloaded from <http://commons.apache.org/daemon>.
+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.
-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.
+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
-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'.
+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.
Modified: trunk/commons-daemon/debian/patches/libgcj_PR31700.diff
===================================================================
--- trunk/commons-daemon/debian/patches/libgcj_PR31700.diff 2011-07-07 04:02:04 UTC (rev 13841)
+++ trunk/commons-daemon/debian/patches/libgcj_PR31700.diff 2011-07-10 20:09:13 UTC (rev 13842)
@@ -4,7 +4,7 @@
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
Modified: trunk/commons-daemon/debian/patches/sh4_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/sh4_support.diff 2011-07-07 04:02:04 UTC (rev 13841)
+++ trunk/commons-daemon/debian/patches/sh4_support.diff 2011-07-10 20:09:13 UTC (rev 13842)
@@ -13,6 +13,6 @@
+ 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"
More information about the pkg-java-commits
mailing list