[libreoffice] 01/01: 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 7d14cb8b58b5e53527f6c6c1646d6e4a0681eeac
Merge: ad553b0 22c9d36
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 10 16:48:59 2017 +0200

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

 changelog                              |  11 ++
 control                                | 329 ++++++++++++++++-----------------
 control.help.in                        |   4 +-
 control.lang.in                        |   2 +-
 libreoffice-l10n-in.lintian-overrides  |   2 +
 libreoffice-l10n-za.lintian-overrides  |   2 +
 patches/series                         |   1 -
 patches/ww8export-HAVE_MORE_FONTS.diff |  22 ---
 rules                                  |  12 +-
 9 files changed, 185 insertions(+), 200 deletions(-)

diff --cc changelog
index ee20cc4,b84e7d1..c3fc0df
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,14 +1,32 @@@
 +libreoffice (1:6.0.0~alpha0~git20171008-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * 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>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.2-2) unstable; urgency=medium
+ 
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff: remove again ...
+   * debian/rules: ... and install LOs fc_local.conf to instdir before make
+     check
+ 
+   * debian/control.{lang,help},in: remove | language-support-translations-*
+     Depends:/Recommends: to unconfuse piuparts
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 10 Oct 2017 14:33:23 +0000
+ 
  libreoffice (1:5.4.2-1) unstable; urgency=medium
  
    * LibreOffice 5.4.2 final release (identical to rc2)
diff --cc control
index 585c45c,8ea522b..202b0ce
--- a/control
+++ b/control
@@@ -189,9 -186,9 +189,9 @@@ Build-Conflicts: amd-libopencl1
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1
  Standards-Version: 4.0.1
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice at lists.debian.org
+ Bugs: 
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice
@@@ -2037,14 -2016,14 +2030,14 @@@ Package: libreoffice-l10n-km
  Section: localization
  Architecture: all
  Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
- Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kmr
+ Recommends: libreoffice-core (>> ${base-version})
  Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
 -Suggests: hunspell-dictionary-ko | myspell-dictionary-ko,
 -          hyphen-ko,
 -          libreoffice-grammarcheck-ko,
 -          libreoffice-help-ko,
 -          mythes-ko
 -Description: office productivity suite -- Korean language package
 +Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
 +          hyphen-kmr,
 +          libreoffice-grammarcheck-kmr,
 +          libreoffice-help-kmr,
 +          mythes-kmr
 +Description: office productivity suite -- Kurmanji language package
   LibreOffice is a full-featured office productivity suite that provides
   a near drop-in replacement for Microsoft(R) Office.
   .
@@@ -2066,14 -2045,14 +2059,14 @@@ Package: libreoffice-l10n-k
  Section: localization
  Architecture: all
  Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
- Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kn
+ Recommends: libreoffice-core (>> ${base-version})
  Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
 -Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
 -          hyphen-kmr,
 -          libreoffice-grammarcheck-kmr,
 -          libreoffice-help-kmr,
 -          mythes-kmr
 -Description: office productivity suite -- Kurmanji language package
 +Suggests: hunspell-dictionary-kn | myspell-dictionary-kn,
 +          hyphen-kn,
 +          libreoffice-grammarcheck-kn,
 +          libreoffice-help-kn,
 +          mythes-kn
 +Description: office productivity suite -- Kannada language package
   LibreOffice is a full-featured office productivity suite that provides
   a near drop-in replacement for Microsoft(R) Office.
   .
diff --cc patches/series
index baf4818,58bc856..e5569a2
--- a/patches/series
+++ b/patches/series
@@@ -28,4 -29,6 +28,3 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
- ww8export-HAVE_MORE_FONTS.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff

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