[commons-daemon] 35/52: Imported Debian patch 1.0.7-2

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository commons-daemon.

commit 18121cd714590b79caae141d500b579b0ba1eb0f
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon Aug 22 23:07:18 2011 +0200

    Imported Debian patch 1.0.7-2
---
 debian/changelog                  |  6 ++++++
 debian/patches/s390x_support.diff | 13 +++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fb0f7c0..d0dfd4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+commons-daemon (1.0.7-2) unstable; urgency=low
+
+  * Add support for s390x. Closes: #638907.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 22 Aug 2011 23:07:18 +0200
+
 commons-daemon (1.0.7-1) unstable; urgency=high
 
   * New upstream security release.
diff --git a/debian/patches/s390x_support.diff b/debian/patches/s390x_support.diff
new file mode 100644
index 0000000..3038b32
--- /dev/null
+++ b/debian/patches/s390x_support.diff
@@ -0,0 +1,13 @@
+Index: b/src/native/unix/support/apsupport.m4
+===================================================================
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -126,7 +126,7 @@
+     CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
+     supported_os="ia64"
+     HOST_CPU=ia64;;
+-  s390)
++  s390 | s390x)
+     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+     supported_os="s390"
+     HOST_CPU=s390;;
diff --git a/debian/patches/series b/debian/patches/series
index 5484802..ea7a3da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ powerpcspe_support.diff
 hppa_support.diff
 arm_support.diff
 hurd_support.diff
+s390x_support.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git