[libreoffice] 01/01: rename 30_opensymbol.conf to 30-opensymbol.conf for consistency

[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 59f1c46373f2e021eb8d525caf142e63df78fd82
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 28 12:59:17 2017 +0100

    rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
---
 changelog | 7 +++----
 rules     | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 4af6d70..c6fd2ed 100644
--- a/changelog
+++ b/changelog
@@ -1,14 +1,13 @@
-<<<<<<< HEAD
 libreoffice (1:5.4.5~rc1~git20171214-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
+  * debian/rules:
+    - rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
+
  -- 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
diff --git a/rules b/rules
index df0de5b..c72ea00 100755
--- a/rules
+++ b/rules
@@ -3043,9 +3043,9 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
 	# build here right now anyway.
 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.conf \
-		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.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
+		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

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