[commons-daemon] 48/52: Imported Debian patch 1.0.15-5.1

[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 d5e28a1be4f0fe3971fcb48717a5f59da0f5c4af
Author: YunQiang Su <syq at debian.org>
Date:   Fri Oct 24 12:35:27 2014 +0800

    Imported Debian patch 1.0.15-5.1
---
 debian/changelog                             |  9 +++++++++
 debian/patches/mips_abi_n32_n64_support.diff | 22 ++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a852979..73801af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+commons-daemon (1.0.15-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  
+  [Sphinx Jiang]
+  * Add the support for mips abi n32 and n64 (Closes: #752054)
+
+ -- YunQiang Su <syq at debian.org>  Fri, 24 Oct 2014 12:35:27 +0800
+
 commons-daemon (1.0.15-5) unstable; urgency=medium
 
   * Another attempt to support Hurd
diff --git a/debian/patches/mips_abi_n32_n64_support.diff b/debian/patches/mips_abi_n32_n64_support.diff
new file mode 100644
index 0000000..6673a74
--- /dev/null
+++ b/debian/patches/mips_abi_n32_n64_support.diff
@@ -0,0 +1,22 @@
+Index: commons-daemon-1.0.15/src/native/unix/support/apsupport.m4
+===================================================================
+--- commons-daemon-1.0.15.orig/src/native/unix/support/apsupport.m4     2014-06-19 05:40:23.000000000 +0000
++++ commons-daemon-1.0.15/src/native/unix/support/apsupport.m4  2014-06-19 05:46:23.202817468 +0000
+@@ -113,7 +113,7 @@
+     LDCMD="/opt/C/bin/cc"
+     HOST_CPU=osd
+     ;;
+-  mips)
++  mips | mipsn32 | mips64)
+     CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
+     supported_os="mips"
+     HOST_CPU=mips
+@@ -142,7 +142,7 @@
+     fi
+     CFLAGS="$CFLAGS -DCPU=\\\"$HOST_CPU\\\" -DSO_EXT=\\\"sl\\\""
+     ;;
+-  mipsel)
++  mipsel | mipsn32el | mips64el)
+     CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
+     supported_os="mipsel"
+     HOST_CPU=mipsel
diff --git a/debian/patches/series b/debian/patches/series
index 19679ba..178c27a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ libgcj_PR31700.diff
 kfreebsd_support.diff
 s390x_support.diff
 hurd_support.diff
+mips_abi_n32_n64_support.diff

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