[libreoffice] 01/03: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

[Rene Engelhard]

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

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

commit 7a4fc209a2be3d14f89e4fa9bcb9b113878a745b
Merge: 8d657ef 25e8cb5
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 7 22:18:57 2017 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

 changelog               |  5 ++++-
 patches/java9-jawt.diff | 13 +++++++++++++
 patches/series          |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --cc changelog
index a37e4e2,4c53f24..b77dc42
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,12 +1,16 @@@
 -libreoffice (1:5.4.3-1) unstable; urgency=medium
 +libreoffice (1:6.0.0~beta1~git20171106-1) UNRELEASED; urgency=medium
  
 -  * New upstream release
 +  * New upstream snapshot
  
 -  * debian/patches/java9-jawt.diff: add from master; find jawt with Java9 and
 -    also fix odk/settings/settings.mk for it
 -  * debian/patches/java9-jawt.rhino: add from master; fix rhino build with Java9
++  * debian/patches/java9-jawt.diff: add from master; fix odk/settings/settings.mk for
++    jawt with Java9
+ 
    * debian/rules:
 +    - use (dh_)dwz and (if enabled) install the multifile file into
 +      uno-libs3-dbgsym.
 +      Thanks Matthias Klose for the hint.
 +      Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
 +      file and is recommended anyway because of the gdb helpers.
      - be consequent and enable the junit tests on armhf/arm64 now that
        those work.
      - stop passing --disable-database-connectivity for no-Base archs
@@@ -23,28 -25,13 +26,28 @@@
    * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
      on i386- -java-common would make more sense, but it's Arch: all..
  
-  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 19:34:51 +0100
+  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
  
 -libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 +libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
  
 -  * upload to unstable
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 24 Oct 2017 23:15:10 +0200
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:42:40 +0000
  
  libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
  
diff --cc patches/java9-jawt.diff
index 0000000,855416b..e6dc3ee
mode 000000,100644..100644
--- a/patches/java9-jawt.diff
+++ b/patches/java9-jawt.diff
@@@ -1,0 -1,31 +1,13 @@@
 -diff --git a/configure.ac b/configure.ac
 -index 93543ddccf4e..6ee677e222a1 100644
 ---- a/configure.ac
 -+++ b/configure.ac
 -@@ -7126,7 +6907,12 @@ then
 -             my_java_arch=$host_cpu
 -             ;;
 -         esac
 --        JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
 -+        # This is where JDK9 puts the library
 -+        if test -e "$JAVA_HOME/lib/libjawt.so"; then
 -+            JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
 -+        else
 -+            JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
 -+        fi
 -         AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
 -     fi
 -     AC_MSG_RESULT([$JAWTLIB])
+ diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+ index 2813959f5dec..684c39edae91 100644
+ --- a/odk/settings/settings.mk
+ +++ b/odk/settings/settings.mk
+ @@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
+  
+  EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
+  LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
+ -LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
+ +LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib"
+  
+  URE_MISC=$(OFFICE_PROGRAM_PATH)
+  
diff --cc patches/series
index 063d940,98e622e..a3ae0c6
--- a/patches/series
+++ b/patches/series
@@@ -30,5 -31,9 +30,6 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff
  ww8export-HAVE_MORE_FONTS.diff
 +tdf108963-test.diff
+ java9-jawt.diff
 -java9-rhino.diff

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