[libreoffice] 01/01: 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 229cf5d2d701fa9164d1854f6dcac6025f417976
Merge: e297799 55c32a7
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 09:45:11 2016 +0200

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

 README.Debian-source            | 183 ++++++++++++----------------------------
 bug-presubj                     |   3 +
 changelog                       |  16 ++++
 control                         |   5 +-
 control.in                      |   5 +-
 patches/series                  |   1 +
 patches/xfce-fallback-list.diff |  27 ++++++
 7 files changed, 107 insertions(+), 133 deletions(-)

diff --cc changelog
index 4097e0a,e440ab0..719b115
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,19 +1,41 @@@
 +libreoffice (1:5.3.0~alpha0~git20160905-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-1) unstable; urgency=medium
+ 
+   * LibreOffice 5.2.1 final (identical to rc2)
+ 
+   * debian/patches/xfce-fallback-list.diff: remove gtk3 from fallback list
+     for xfce (closes: #836531)
+  
+   * upload to unstable
+ 
+   * debian/bug-presubj: mention https://wiki.debian.org/AutomaticDebugPackages
+   * debian/control.in: make the libreoffice meta-package depend also on
+      fonts-crosextra-caladea, fonts-crosextra-carlito and fonts-linuxlibertine
+   * debian/README.Debian-source: update (closes: #836186)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 04 Sep 2016 12:25:34 +0200
+ 
  libreoffice (1:5.2.1~rc2-1) experimental; urgency=medium
  
    * new upstream release candidate
diff --cc control
index 6674778,afdf251..09cebec
--- a/control
+++ b/control
@@@ -189,8 -196,11 +189,11 @@@ 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-sil-gentium-basic,
+ Depends: fonts-crosextra-caladea,
+          fonts-crosextra-carlito,
+          fonts-linuxlibertine,
+          fonts-sil-gentium-basic,
 -         libreoffice-base [!mips64],
 +         libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
           libreoffice-calc,
           libreoffice-core (= ${binary:Version}),
           libreoffice-draw,
diff --cc patches/series
index ea3366b,18dc860..ae59717
--- a/patches/series
+++ b/patches/series
@@@ -27,4 -28,6 +27,5 @@@ hppa-is-32bit.dif
  rsc-no-error-about-unknown-switch.diff
  debian-branding.diff
  no-packagekit-per-default.diff
 -sparc64.diff
+ xfce-fallback-list.diff
 +system-officeotron-and-odfvalidator.diff

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