Bug#726389: commons-daemon: diff for NMU version 1.0.15-5.2

2014-11-11 Thread tony mancill 
On 11/06/2014 04:08 AM, Colin Watson wrote:
> Control: tag -1 pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for commons-daemon (versioned as 1.0.15-5.2) and
> uploaded it to DELAYED/10.  Please feel free to tell me if I should
> delay it longer.

A maintainer upload incorporating these changes has been uploaded to
unstable, and an unblock request has been submitted.

Thank you,
tony




signature.asc
Description: OpenPGP digital signature
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#726389: commons-daemon: diff for NMU version 1.0.15-5.2

2014-11-07 Thread tony mancill 
On 11/06/2014 04:08 AM, Colin Watson wrote:
> Control: tag -1 pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for commons-daemon (versioned as 1.0.15-5.2) and
> uploaded it to DELAYED/10.  Please feel free to tell me if I should
> delay it longer.
> 
> I took the liberty of including a very similar patch for ppc64el,
> already tested on Ubuntu.  Per earlier feedback on this bug, I also
> forwarded this upstream.

Hi Colin,

Thank you for the update.  I'll get this change into our packaging repo
as well.

Cheers,
tony




signature.asc
Description: OpenPGP digital signature
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#726389: commons-daemon: diff for NMU version 1.0.15-5.2

2014-11-06 Thread Colin Watson 
Control: tag -1 pending

Dear maintainer,

I've prepared an NMU for commons-daemon (versioned as 1.0.15-5.2) and
uploaded it to DELAYED/10.  Please feel free to tell me if I should
delay it longer.

I took the liberty of including a very similar patch for ppc64el,
already tested on Ubuntu.  Per earlier feedback on this bug, I also
forwarded this upstream.

Regards,

-- 
Colin Watson   [cjwat...@debian.org]
diff -Nru commons-daemon-1.0.15/debian/changelog commons-daemon-1.0.15/debian/changelog
--- commons-daemon-1.0.15/debian/changelog	2014-10-24 05:36:43.0 +0100
+++ commons-daemon-1.0.15/debian/changelog	2014-11-06 11:48:28.0 +
@@ -1,3 +1,11 @@
+commons-daemon (1.0.15-5.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add arm64 support (closes: #726389).
+  * Add ppc64el support.
+
+ -- Colin Watson   Thu, 06 Nov 2014 11:48:27 +
+
 commons-daemon (1.0.15-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru commons-daemon-1.0.15/debian/patches/arm64.diff commons-daemon-1.0.15/debian/patches/arm64.diff
--- commons-daemon-1.0.15/debian/patches/arm64.diff	1970-01-01 01:00:00.0 +0100
+++ commons-daemon-1.0.15/debian/patches/arm64.diff	2014-11-06 11:30:03.0 +
@@ -0,0 +1,37 @@
+Description: Add ARM64 support
+Author: Colin Watson 
+Forwarded: https://issues.apache.org/jira/browse/DAEMON-308
+Last-Update: 2014-11-06
+
+Index: b/src/native/unix/configure
+===
+--- a/src/native/unix/configure
 b/src/native/unix/configure
+@@ -2697,6 +2697,11 @@
+ supported_os="arm"
+ HOST_CPU=arm
+ ;;
++  aarch64)
++CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
++supported_os="aarch64"
++HOST_CPU=aarch64
++;;
+   *)
+ echo "$as_me:$LINENO: result: failed" >&5
+ echo "${ECHO_T}failed" >&6
+Index: b/src/native/unix/support/apsupport.m4
+===
+--- a/src/native/unix/support/apsupport.m4
 b/src/native/unix/support/apsupport.m4
+@@ -176,6 +176,11 @@
+ supported_os="arm"
+ HOST_CPU=arm
+ ;;
++  aarch64)
++CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
++supported_os="aarch64"
++HOST_CPU=aarch64
++;;
+   *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
diff -Nru commons-daemon-1.0.15/debian/patches/ppc64el.diff commons-daemon-1.0.15/debian/patches/ppc64el.diff
--- commons-daemon-1.0.15/debian/patches/ppc64el.diff	1970-01-01 01:00:00.0 +0100
+++ commons-daemon-1.0.15/debian/patches/ppc64el.diff	2014-11-06 11:47:23.0 +
@@ -0,0 +1,37 @@
+Description: Add ppc64el support
+Author: Colin Watson 
+Forwarded: https://issues.apache.org/jira/browse/DAEMON-326
+Last-Update: 2014-11-06
+
+Index: b/src/native/unix/configure
+===
+--- a/src/native/unix/configure
 b/src/native/unix/configure
+@@ -2702,6 +2702,11 @@
+ supported_os="aarch64"
+ HOST_CPU=aarch64
+ ;;
++  powerpc64le)
++CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\""
++supported_os="powerpc64le"
++HOST_CPU=powerpc64le
++;;
+   *)
+ echo "$as_me:$LINENO: result: failed" >&5
+ echo "${ECHO_T}failed" >&6
+Index: b/src/native/unix/support/apsupport.m4
+===
+--- a/src/native/unix/support/apsupport.m4
 b/src/native/unix/support/apsupport.m4
+@@ -181,6 +181,11 @@
+ supported_os="aarch64"
+ HOST_CPU=aarch64
+ ;;
++  powerpc64le)
++CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\""
++supported_os="powerpc64le"
++HOST_CPU=powerpc64le
++;;
+   *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
diff -Nru commons-daemon-1.0.15/debian/patches/series commons-daemon-1.0.15/debian/patches/series
--- commons-daemon-1.0.15/debian/patches/series	2014-10-24 05:34:58.0 +0100
+++ commons-daemon-1.0.15/debian/patches/series	2014-11-06 11:46:44.0 +
@@ -3,3 +3,5 @@
 s390x_support.diff
 hurd_support.diff
 mips_abi_n32_n64_support.diff
+arm64.diff
+ppc64el.diff
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.