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

[Rene Engelhard]

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

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

commit 9a3de73d46268564301d374f554c5f6890699cce
Merge: 22a48c9 0614879
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 17 00:08:19 2017 +0100

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

 changelog                                          | 13 +++++++---
 control                                            | 26 +++++++++----------
 ...rol.reportdesign.in => control.reportbuilder.in |  2 +-
 rules                                              | 29 +++++++++++-----------
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --cc changelog
index 158af86,882cc4c..4af6d70
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,7 +1,17 @@@
++<<<<<<< HEAD
 +libreoffice (1:5.4.5~rc1~git20171214-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 12 Dec 2017 19:10:51 +0100
 +
 +libreoffice (1:5.4.4~rc2-1) UNRELEASED; urgency=medium
++=======
+ libreoffice (1:5.4.4-1) unstable; urgency=medium
++>>>>>>> origin/master
  
    [ Rene Engelhard ]
-   * New upstream release candidate
+   * New upstream release
      - colours referenced cells again (closes: #883254)
      - doesn't crash anymore when clicking in the Input Line of a
        protected cell (closes: #884149)
diff --cc rules
index b45920a,c43fe48..681f67f
--- a/rules
+++ b/rules
@@@ -3030,13 -3030,22 +3030,26 @@@ endi
  	perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
  		$(PKGDIR)-common/$(OODIR)/program/unopkg
  
++	# this only works with --without-fonts. Otherwise we get all stuff here,
++	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
++	# build here right now anyway.
  ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
  	mkdir -p debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
  	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
  		debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
  	rm -rf $(PKGDIR)-common/$(OODIR)/share/fonts/truetype
+ 	mkdir -p debian/fonts-opensymbol/etc/fonts/conf.d
+ 	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail
+ 	# this only works with --without-fonts. Otherwise we get all stuff here,
+ 	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
+ 	# build here right now anyway.
 -	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
++	mv $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf \
+ 		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+         cd debian/fonts-opensymbol/etc/fonts.d/ && \
+                 ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
  else
  	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
++	rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
  endif
  
  	# remove extra license files

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