[libreoffice] 01/01: fix Java arch for m68k, patch by John Paul Adrian Glaubitz

[Rene Engelhard]

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

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

commit 36624024893d150565500d0428f37d822db0a631
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Nov 27 23:19:20 2016 +0100

    fix Java arch for m68k, patch by John Paul Adrian Glaubitz
---
 changelog                   |  3 +++
 patches/m68k-java-arch.diff | 23 +++++++++++++++++++++++
 patches/series              |  1 +
 3 files changed, 27 insertions(+)

diff --git a/changelog b/changelog
index efd0063..134f685 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ libreoffice (1:5.2.4~rc1~git20161125-1) UNRELEASED; urgency=medium
       (closes: #834622)
     - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 
+  * debian/patches/m68k-java-arch.diff: fix Java arch for m68k, patch by
+    John Paul Adrian Glaubitz
+
  -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 
 libreoffice (1:5.2.3-2) unstable; urgency=medium
diff --git a/patches/m68k-java-arch.diff b/patches/m68k-java-arch.diff
new file mode 100644
index 0000000..0efc886
--- /dev/null
+++ b/patches/m68k-java-arch.diff
@@ -0,0 +1,23 @@
+From f35d29c8388744be1f95ec4acfca12eec706911a Mon Sep 17 00:00:00 2001
+From: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
+Date: Sun, 27 Nov 2016 19:22:59 +0100
+Subject: Fix typo in configure.ac (mk68 -> m68k)
+
+Change-Id: Ibbedf9444e2c43b3dff886d9513be7e3d2a99095
+
+diff --git a/configure.ac b/configure.ac
+index 731e903..4480ed0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7121,7 +7121,7 @@ then
+             my_java_arch=i386
+             ;;
+         m68k)
+-            my_java_arch=mk68
++            my_java_arch=m68k
+             ;;
+         powerpc)
+             my_java_arch=ppc
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 0874b47..a1a715e 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ no-packagekit-per-default.diff
 sparc64.diff
 startcenter-grey-out-not-installed.diff
 no-openssl.diff
+m68k-java-arch.diff

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