[libreoffice] 04/05: git update; update gcj-no-bitness-check.diff and hppa-is-32bit.diff

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit e307d0fe650b96396ee7b7250aa0c8c91c709518
Author: Rene Engelhard <r...@debian.org>
Date:   Sat Oct 10 17:47:26 2015 +0200

    git update; update gcj-no-bitness-check.diff and hppa-is-32bit.diff
---
 changelog                         | 2 +-
 patches/gcj-no-bitness-check.diff | 2 +-
 patches/hppa-is-32bit.diff        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index f3e79d3..f53410a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~alpha1~git20151009-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20151010-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
     - uses HttpURLConnection etc. of the JDK instead of commons httpclient
diff --git a/patches/gcj-no-bitness-check.diff 
b/patches/gcj-no-bitness-check.diff
index 50275e4..c80cf71 100644
--- a/patches/gcj-no-bitness-check.diff
+++ b/patches/gcj-no-bitness-check.diff
@@ -6,7 +6,7 @@
      elif test "$cross_compiling" != "yes"; then
 +      if [ "$JAVAINTERPRETER" != "/usr/lib/jvm/java-gcj/bin/java" ]; then
          case $CPUNAME in
-             AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64)
+             AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|GODSON64)
                  if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 
2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
 @@ -6684,6 +6685,7 @@ if test "$ENABLE_JAVA" != ""; then
                  fi
diff --git a/patches/hppa-is-32bit.diff b/patches/hppa-is-32bit.diff
index d7a36d2..b3ceb17 100644
--- a/patches/hppa-is-32bit.diff
+++ b/patches/hppa-is-32bit.diff
@@ -6,8 +6,8 @@ index 42dc3b4..f5a51c9 100644
          JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
      elif test "$cross_compiling" != "yes"; then
          case $CPUNAME in
--            AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
-+            AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64)
+-            AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64)
++            AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|GODSON64)
                  if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 
2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
                      AC_MSG_WARN([You are building 64-bit binaries but the JDK 
$JAVAINTERPRETER is 32-bit])
                      AC_MSG_ERROR([You should pass the --with-jdk-home option 
pointing to a 64-bit JDK])

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git