[libreoffice] 01/02: 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 c4bacf733d52ca445a1e318a0e58509151519b7c
Merge: 3326253 c891290
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 17 01:21:02 2017 +0100

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

 control | 2 +-
 rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc control
index f9d91ce,3eca426..4912333
--- a/control
+++ b/control
@@@ -187,9 -187,9 +187,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
diff --cc rules
index a3d3c59,f078afd..078132c
--- a/rules
+++ b/rules
@@@ -3022,9 -3040,9 +3022,9 @@@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y
  	# 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/ && \
+ 	cd debian/fonts-opensymbol/etc/fonts/conf.d/ && \
  		ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
  else
  	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf

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