Author: ebourg-guest
Date: 2013-04-03 08:22:27 +0000 (Wed, 03 Apr 2013)
New Revision: 16477
Removed:
trunk/commons-daemon/debian/patches/arm_support.diff
trunk/commons-daemon/debian/patches/hppa_support.diff
trunk/commons-daemon/debian/patches/hurd_support.diff
trunk/commons-daemon/debian/patches/libcap_dlopen.diff
trunk/commons-daemon/debian/patches/powerpcspe_support.diff
trunk/commons-daemon/debian/patches/s390x_support.diff
trunk/commons-daemon/debian/patches/sh4_support.diff
Modified:
trunk/commons-daemon/debian/changelog
trunk/commons-daemon/debian/control
trunk/commons-daemon/debian/patches/kfreebsd_support.diff
trunk/commons-daemon/debian/patches/series
Log:
New upstream release (1.0.15)
Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog 2013-04-03 06:01:49 UTC (rev
16476)
+++ trunk/commons-daemon/debian/changelog 2013-04-03 08:22:27 UTC (rev
16477)
@@ -1,3 +1,12 @@
+commons-daemon (1.0.15-1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release.
+ * Removed the patches merged upstream
+ * d/control: Bump Standards-Version to 3.9.4: no changes needed.
+
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 03 Apr 2013 10:17:55 +0200
+
commons-daemon (1.0.10-3) unstable; urgency=low
* Team upload.
Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control 2013-04-03 06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/control 2013-04-03 08:22:27 UTC (rev 16477)
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Marcus Better <mar...@better.se>,
- Damien Raude-Morvan <draz...@debian.org>
+ Damien Raude-Morvan <draz...@debian.org>,
+ Emmanuel Bourg <ebo...@apache.org>
Build-Depends: ant,
autoconf,
autotools-dev,
@@ -14,7 +15,7 @@
maven-repo-helper,
xsltproc
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
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/
@@ -24,7 +25,7 @@
Depends: ${misc:Depends}
Suggests: java-virtual-machine
Recommends: jsvc
-Description: library to launch Java applications as daemons
+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
@@ -39,7 +40,7 @@
Architecture: any
Depends: libcommons-daemon-java, ${misc:Depends}, ${shlibs:Depends}
Recommends: default-jre-headless | java2-runtime-headless
-Description: wrapper to launch Java applications as daemons
+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.
Deleted: trunk/commons-daemon/debian/patches/arm_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/arm_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/arm_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,16 +0,0 @@
-Description: Add support for ARM/ARMel arch
-Last-Update: 2010-07-28
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -81,6 +81,9 @@
- ;;
- esac
- case $host_cpu in
-+ arm*)
-+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ HOST_CPU=$host_cpu;;
- powerpc*)
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
- HOST_CPU=$host_cpu;;
Deleted: trunk/commons-daemon/debian/patches/hppa_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/hppa_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/hppa_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,25 +0,0 @@
-Description: Fix support for HPPA arch
-Last-Update: 2010-07-28
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -108,15 +108,9 @@
- CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\""
- supported_os="alpha"
- HOST_CPU=alpha;;
-- hppa2.0w|hppa64)
-- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\" -DSO_EXT=\\\"sl\\\""
-- HOST_CPU=PA_RISC2.0W;;
-- hppa2.0n)
-- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0N\\\" -DSO_EXT=\\\"sl\\\""
-- HOST_CPU=PA_RISC2.0N;;
-- hppa2.0)
-- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\" -DSO_EXT=\\\"sl\\\""
-- HOST_CPU=PA_RISC2.0;;
-+ hppa*)
-+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ HOST_CPU=$host_cpu;;
- mipsel)
- CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
- supported_os="mipsel"
Deleted: trunk/commons-daemon/debian/patches/hurd_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/hurd_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/hurd_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,19 +0,0 @@
-Description: Add support for Hurd OS
-Last-Update: 2010-08-03
-
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -75,6 +75,11 @@
- supported_os="kfreebsd-gnu"
- LIBS="$LIBS -ldl -lpthread"
- ;;
-+ gnu*)
-+ CFLAGS="$CFLAGS -DOS_HURD -DDSO_DLFCN -pthread "
-+ supported_os="hurd-gnu"
-+ LIBS="$LIBS -ldl -lpthread"
-+ ;;
- *)
- AC_MSG_RESULT([failed])
- AC_MSG_ERROR([Unsupported operating system "$host_os"])
Modified: trunk/commons-daemon/debian/patches/kfreebsd_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/kfreebsd_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/kfreebsd_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -2,13 +2,11 @@
Bug: http://bugs.debian.org/498376
Author: Petr Salinger <petr.salin...@seznam.cz>
Last-Update: 2010-07-28
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
--- a/src/native/unix/support/apsupport.m4
+++ b/src/native/unix/support/apsupport.m4
-@@ -70,6 +70,11 @@
- CFLAGS="$CFLAGS -DOS_AIX -DDSO_DLFCN"
+@@ -73,6 +73,11 @@
LDFLAGS="$LDFLAGS -ldl"
+ supported_os="aix5"
;;
+ kfreebsd*-gnu)
+ CFLAGS="$CFLAGS -DOS_BSD -DDSO_DLFCN -pthread"
Deleted: trunk/commons-daemon/debian/patches/libcap_dlopen.diff
===================================================================
--- trunk/commons-daemon/debian/patches/libcap_dlopen.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/libcap_dlopen.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,25 +0,0 @@
-From: tony mancill <tmanc...@debian.org>
-Description: jsvc fails to load libcap.so.2 from /lib64 (or multiarch)
-Bug: https://issues.apache.org/jira/browse/DAEMON-246
-Bug-Debian: http://bugs.debian.org/685025
-Origin: upstream,
https://issues.apache.org/jira/secure/attachment/12517413/patch.txt
-Forwarded: not-needed
-Author: Emily Middleton
-=========================================================================
---- a/src/native/unix/native/jsvc-unix.c 2012-03-07 13:46:57.946756436
+0000
-+++ b/src/native/unix/native/jsvc-unix.c 2012-03-07 13:37:12.068505335
+0000
-@@ -247,12 +247,9 @@
- static fd_cap_set_proc fp_cap_set_proc;
-
- static const char *libcap_locs[] = {
-- "/lib/libcap.so.2",
-- "/lib/libcap.so.1",
-- "/lib/libcap.so",
-- "/usr/lib/libcap.so.2",
-- "/usr/lib/libcap.so.1",
-- "/usr/lib/libcap.so",
-+ "libcap.so",
-+ "libcap.so.2",
-+ "libcap.so.1",
- NULL
- };
Deleted: trunk/commons-daemon/debian/patches/powerpcspe_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/powerpcspe_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/powerpcspe_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,15 +0,0 @@
-Description: Add support for powerpcspe arch
-Last-Update: 2010-07-28
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -81,7 +81,7 @@
- ;;
- esac
- case $host_cpu in
-- powerpc)
-+ powerpc*)
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
- HOST_CPU=$host_cpu;;
- sparc*)
Deleted: trunk/commons-daemon/debian/patches/s390x_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/s390x_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/s390x_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,13 +0,0 @@
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -143,7 +143,7 @@
- HOST_CPU=ia64
- fi
- ;;
-- s390)
-+ s390 | s390x)
- CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
- supported_os="s390"
- HOST_CPU=s390;;
Modified: trunk/commons-daemon/debian/patches/series
===================================================================
--- trunk/commons-daemon/debian/patches/series 2013-04-03 06:01:49 UTC (rev
16476)
+++ trunk/commons-daemon/debian/patches/series 2013-04-03 08:22:27 UTC (rev
16477)
@@ -1,9 +1,2 @@
libgcj_PR31700.diff
-sh4_support.diff
kfreebsd_support.diff
-powerpcspe_support.diff
-hppa_support.diff
-arm_support.diff
-hurd_support.diff
-s390x_support.diff
-libcap_dlopen.diff
Deleted: trunk/commons-daemon/debian/patches/sh4_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/sh4_support.diff 2013-04-03
06:01:49 UTC (rev 16476)
+++ trunk/commons-daemon/debian/patches/sh4_support.diff 2013-04-03
08:22:27 UTC (rev 16477)
@@ -1,20 +0,0 @@
-Description: support Renesas SH4
-Bug: http://bugs.debian.org/564166
-Author: Nobuhiro Iwamatsu <iwama...@nigauri.org>
-Author: Damien Raude-Morvan <draz...@debian.org>
-Last-Update: 2010-07-27
-Forwarded: no
-Index: b/src/native/unix/support/apsupport.m4
-===================================================================
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -140,6 +140,9 @@
- CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
- supported_os="s390"
- HOST_CPU=s390;;
-+ sh*)
-+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ HOST_CPU=$host_cpu;;
- arm*)
- CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
- supported_os="arm"
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
