[libreoffice] 01/03: git update; remove obsolete odk-settings-JAVA_PROC_TYPE.diff

[Rene Engelhard]

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

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

commit 4cf1b4b5b4c6caf59b3100d85b1dbd2795ecec00
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 15 20:35:27 2017 +0200

    git update; remove obsolete odk-settings-JAVA_PROC_TYPE.diff
---
 changelog                                |  6 ++++
 patches/odk-settings-JAVA_PROC_TYPE.diff | 52 --------------------------------
 patches/series                           |  1 -
 3 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/changelog b/changelog
index f072ea6..d0bafd6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.0~rc1~git20170615-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 12 Jun 2017 23:44:55 +0200
+
 libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 
   * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
diff --git a/patches/odk-settings-JAVA_PROC_TYPE.diff b/patches/odk-settings-JAVA_PROC_TYPE.diff
deleted file mode 100644
index 9a2eb00..0000000
--- a/patches/odk-settings-JAVA_PROC_TYPE.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4256ac0daa42107cfaf1ce54dbd1db6ce82975b0 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Fri, 9 Jun 2017 21:08:31 +0200
-Subject: [PATCH] odk settings.mk: add various missing JAVA_PROC_TYPE overrides
- for Linux arches
-
-... which were missing since ~ ever but now break the odk_build-examples test
-with /usr/bin/ld: cannot find -ljawt
-
-Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea
----
- odk/settings/settings.mk | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
-index b455a6b5d399..2813959f5dec 100644
---- a/odk/settings/settings.mk
-+++ b/odk/settings/settings.mk
-@@ -275,6 +275,30 @@ ifeq "$(PROCTYPE)" "powerpc64"
- JAVA_PROC_TYPE=ppc64
- endif
- 
-+ifeq "$(PROCTYPE)" "powerpc64_le"
-+JAVA_PROC_TYPE=ppc64le
-+endif
-+
-+ifeq "$(PROCTYPE)" "arm_eabi"
-+JAVA_PROC_TYPE=arm
-+endif
-+
-+ifeq "$(PROCTYPE)" "arm_oabi"
-+JAVA_PROC_TYPE=arm
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips_eb"
-+JAVA_PROC_TYPE=mips
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips_el"
-+JAVA_PROC_TYPE=mipsel
-+endif
-+
-+ifeq "$(PROCTYPE)" "mips64_el"
-+JAVA_PROC_TYPE=mips64el
-+endif
-+
- ifeq "$(PROCTYPE)" "sparc64"
- UNOPKG_PLATFORM=Linux_SPARC64
- JAVA_PROC_TYPE=sparcv9
--- 
-2.11.0
-
diff --git a/patches/series b/patches/series
index 856af0e..3385c2f 100644
--- a/patches/series
+++ b/patches/series
@@ -32,5 +32,4 @@ disable-sc_subsequent_filters_test-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
-odk-settings-JAVA_PROC_TYPE.diff
 gerrit_38597.diff

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