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

Sat Nov 25 13:49:03 UTC 2017

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 30d485eadcda17209c78c33afac806cc3dfaa4f0
Merge: 29ab3b0 d1d1e52
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 25 14:48:46 2017 +0100

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

 changelog       |  4 ++++
 control         |  3 ++-
 control.in      |  3 ++-
 control.kde4.in |  2 +-
 rules           | 39 +++++++++++++++++++++++++++++++--------
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --cc changelog
index e032692,00ebc1c..d9a08b2

--- a/changelog
+++ b/changelog
@@@ -20,42 -6,63 +20,46 @@@ libreoffice (1:6.0.0~beta1~git20171120-
      - replace some manual dpkg-parsechangelog calls with
        $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
        --disable-dependency-tracking
+     - enable missed sr-Latn but merge into -sr
+     - install the apparmor profiles disabled for now (closes: #882597)
 +  * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
 +    $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
 +  * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
 +    apparmor profiles (add missing /). mv_conffile the files to the new
 +    name...
 +  * 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..
    * debian/control.in:
 +    - add fonts-noto-hinted, fonts-noto-mono, fonts-noto-unhinted to
 +      Recommends
      - clean up mozilla suggests to just firefox-esr | thunderbird | firefox
      - add versions to openjdk-{7,8}-jre-headless conflicts now that they are
        also supposed to be fixed
+   * debian/control.{kde.}.in: suggest the "certificate managers" for gpg:
+     gpa, seahorse, kleopatra | gpg
  
 - -- Rene Engelhard <rene at debian.org>  Thu, 23 Nov 2017 18:44:11 +0100
 -
 -libreoffice (1:5.4.3-2) unstable; urgency=medium
 -
 -  * debian/patches/java9-*: remove ...
 -  * debian/patches/java9.diff: ... and merge into one patch again.
 -  * debian/patches/java9.diff: backport also missing tests fix from master.
 -    Also add -Dfile.encoding=UTF8 directly to JavaClassSet.mk
 -
 -  * debian/rules:
 -    - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
 -    - disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex
 -      with a libcurl-related SIGSEGV. At least upstream those are not ran
 -      (at least for armhf) anyway on those archs.
 + -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
  
 - -- Rene Engelhard <rene at debian.org>  Mon, 13 Nov 2017 17:43:19 +0100
 +libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
  
 -libreoffice (1:5.4.3-1) unstable; urgency=medium
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
  
 -  * New upstream release
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
  
 -  * debian/patches/java9-jawt.diff: add from master; find jawt with Java9 and
 -    also fix odk/settings/settings.mk for it
 -  * debian/patches/java9-rhino.diff: add from master; fix rhino build with Java9
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
  
    * debian/rules:
 -    - be consequent and enable the junit tests on armhf/arm64 now that
 -      those work.
 -    - stop passing --disable-database-connectivity for no-Base archs
 -      (closes: #874274)
 -    - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
 -    - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
 -      Java9 in reportbuilder) 
 -  * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
 -    $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
 -  * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
 -    apparmor profiles (add missing /). mv_conffile the files to the new
 -    name...
 -  * 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 20:59:01 +0100
 -
 -libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 +    - 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....
  
 -  * upload to unstable
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 24 Oct 2017 23:15:10 +0200
 + -- 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 rules
index 8ef7ffd,35e0c47..84c9107
--- a/rules
+++ b/rules
@@@ -970,8 -1007,8 +971,8 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
  	#ISOS=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
  	ISOS:=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el \
  	  en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja \
 -	  ka kk km ko kmr-Latn lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
 -	  pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv \
 +	  ka kk km kmr-Latn kn ko lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
- 	  pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
++	  pa-IN pl pt pt-BR ro ru rw si sk sl sr st-Latn ss st sv \
  	  ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
      ifeq "$(ENABLE_HELP)" "n"
  	HELPISOS:=
@@@ -983,8 -1020,8 +984,8 @@@
  	#LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
  	LANGPACKISOS:=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el \
  	  en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja \
 -	  ka kk km ko kmr-Latn lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
 +	  ka kk km kmr-Latn kn ko lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
- 	  pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
+ 	  pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv \
  	  ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
    endif
  else

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

