[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

[Rene Engelhard]

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

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

commit 0743327d96c9c6ee146cf6b7ef294e47f889b5c1
Merge: bb1e466 7a51ebc
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Sep 19 09:34:54 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	control
    	patches/series
    	rules

 changelog                                  | 43 ++++++++++++++
 control                                    | 30 ++++++----
 control.in                                 | 29 ++++++---
 patches/gtk3-use-style-updated-signal.diff | 94 ++++++++++++++++++++++++++++++
 patches/series                             |  1 -
 patches/xfce-fallback-list.diff            | 27 ---------
 rules                                      |  7 ++-
 7 files changed, 182 insertions(+), 49 deletions(-)

diff --cc changelog
index 7ea7941,6a41664..8e8490b
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,46 +1,68 @@@
 +libreoffice (1:5.3.0~alpha0~git20160919-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot 
 +    - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
 +
 +  * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
 +    versioned Provides
 +  * debian/rules, debian/control.transitionals.in: remove jessie->stretch
 +    transitionals again
 +  * debian/rules, control.gcj.in: cleanup:
 +    - remove support for gcj (and thus building -gcj "native") completely;
 +      removed upstream; and also openjdk-9 apparently will drop support for
 +      source/target 1.5 (which gcj only supports) and gcc-7 apparently even
 +      will drop gcj, too
 +      (also the officeotron/odfvalidator stuff fails because due to the java-gcj
 +      in the path for safety reasons it picks up gcj..)
 +    - use java6_architectures for computing OOO_JAVA_ARCHS
 +  * debian/copyright: add schema/*/* to Files-Excluded: :/
 +  * debian/uno-libs3.symbols: update
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 26 May 2016 20:00:57 +0200
 +
+ libreoffice (1:5.2.1-3) unstable; urgency=medium
+ 
+   * debian/patches/gtk3-use-style-updated-signal.diff: backport from master;
+     use style-updated instead of style-set signal. This closes: #837356 and
+     hopefully also closes: #836416 for real.
+   * debian/patches/xfce-fallback-list.diff: remove again, didn't help
+ 
+   * debian/control.in: _really_ remove font depends from libreoffice
+   * debian/rules: adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 17 Sep 2016 01:13:20 +0200
+ 
+ libreoffice (1:5.2.1-2) unstable; urgency=medium
+ 
+   * debian/rules: install typesizes.h into
+     usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
+   * debian/control.in:
+     - remove libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
+       Conflicts: from -core, thanks Jon Boden (closes: #836887)
+     - rework libreoffice metapackage "dependencies":
+       + Recommend everything (except GNOME/KDE integration and similar) which
+         the upstream .tar.gz contains:
+          libreoffice-script-provider-bsh,
+          libreoffice-script-provider-js,
+          libreoffice-script-provider-python,
+          libreoffice-ogltrans,
+          libreoffice-librelogo,
+          libreoffice-nlpsolver,
+          libreoffice-pdfimport,
+          libreoffice-report-builder,
+          libreoffice-wiki-publisher
+          libreoffice-sdbc-postgresql
+       + make libreoffice only Recommend the fonts. Mention it recommends
+         extra stuff like fonts to resemble a upstream install, thanks
+         Fabian Greffrath (closes: #836416)
+     - remove obsolete libreoffice-gtk conflicts which makes -core Break: it
+       with bin-NMUs; add (intended) -gtk2/-gtk3 ones...
+ 
+   * merge from Ubuntu:
+     - uno-libs: Create the libuno_* symlinks in the multiarch libdir
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 13 Sep 2016 04:28:17 +0200
+ 
  libreoffice (1:5.2.1-1) unstable; urgency=medium
  
    * LibreOffice 5.2.1 final (identical to rc2)
diff --cc control
index 9bc24d5,9445434..726cb74
--- a/control
+++ b/control
@@@ -189,11 -196,7 +189,7 @@@ Package: libreoffic
  Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
  Section: metapackages
  Pre-Depends: ${misc:Pre-Depends}
- Depends: fonts-crosextra-caladea,
-          fonts-crosextra-carlito,
-          fonts-linuxlibertine,
-          fonts-sil-gentium-basic,
-          libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
 -Depends: libreoffice-base [!mips64],
++Depends: libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
           libreoffice-calc,
           libreoffice-core (= ${binary:Version}),
           libreoffice-draw,
diff --cc patches/series
index ae59717,92e98ee..ea3366b
--- a/patches/series
+++ b/patches/series
@@@ -27,5 -28,6 +27,4 @@@ hppa-is-32bit.dif
  rsc-no-error-about-unknown-switch.diff
  debian-branding.diff
  no-packagekit-per-default.diff
- xfce-fallback-list.diff
 -sparc64.diff
 -gtk3-use-style-updated-signal.diff
 +system-officeotron-and-odfvalidator.diff

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