[libreoffice] 01/06: recommend/build-depend on fonts-liberation2 instead of fonts-liberation

[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 d381a6fffc6f4c040e9252a5ee5f4a8a3b8f665b
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 18 18:44:53 2017 +0100

    recommend/build-depend on fonts-liberation2 instead of fonts-liberation
---
 changelog  | 5 ++++-
 control    | 4 ++--
 control.in | 2 +-
 rules      | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index cf5a152..24fc694 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~rc1~git20171216-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc1~git20171218-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
     - fixes keyboard navigation for textboxes in slide layout (closes: #870387)
@@ -24,6 +24,9 @@ libreoffice (1:6.0.0~rc1~git20171216-1) UNRELEASED; urgency=medium
     - mention icon_themes/elementary*/* copyright/license
   * debian/control.in: remove fonts-noto-unhinted from Recommends: again per
     upstream suggestion
+  * debian/rules, debian/control.in: recommend and build-depend against
+    fonts-liberation2 instead of fonts-liberation since that is actually
+    what LO upstream ships
 
  -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
 
diff --git a/control b/control
index 4912333..74820f6 100644
--- a/control
+++ b/control
@@ -31,7 +31,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                fontconfig [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-               fonts-liberation [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+               fonts-liberation2 [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                g++ (>= 4:7) [m68k],
                gcc (>= 4:7) [m68k],
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
@@ -373,7 +373,7 @@ Package: libreoffice-common
 Architecture: all
 Depends: libreoffice-style-tango, ure, ${misc:Depends}
 Suggests: libreoffice-style
-Recommends: fonts-liberation | ttf-mscorefonts-installer,
+Recommends: fonts-liberation2 | ttf-mscorefonts-installer,
             ${pyuno-depends},
             ${textcat-data-recommends}
 Conflicts: broffice,
diff --git a/control.in b/control.in
index a9bad8e..be6fa0e 100644
--- a/control.in
+++ b/control.in
@@ -197,7 +197,7 @@ Package: libreoffice-common
 Architecture: all
 Depends: libreoffice-style-tango, ure, ${misc:Depends}
 Suggests: libreoffice-style,
-Recommends: ${pyuno-depends}, ${textcat-data-recommends}, fonts-liberation | ttf-mscorefonts-installer
+Recommends: ${pyuno-depends}, ${textcat-data-recommends}, fonts-liberation2 | ttf-mscorefonts-installer
 Conflicts: openoffice-unbundled,
            broffice,
            libreoffice-filter-mobiledev,
diff --git a/rules b/rules
index 80363e0..d9e1a2d 100755
--- a/rules
+++ b/rules
@@ -922,7 +922,7 @@ endif
 	BUILD_DEPS += , locales$(OOO_NO_CHECK_ARCHS) <!nocheck>
 	BUILD_DEPS += , gdb$(OOO_NO_CHECK_ARCHS) <!nocheck>
 	BUILD_DEPS += , fontconfig$(OOO_NO_CHECK_ARCHS) <!nocheck>
-	BUILD_DEPS += , fonts-liberation$(OOO_NO_CHECK_ARCHS) <!nocheck>
+	BUILD_DEPS += , fonts-liberation2$(OOO_NO_CHECK_ARCHS) <!nocheck>
   	BUILD_DEPS += , fonts-crosextra-carlito$(OOO_NO_CHECK_ARCHS) <!nocheck>
         # https://lists.freedesktop.org/archives/libreoffice/2017-May/077764.html
         BUILD_DEPS += , fonts-dejavu$(OOO_NO_CHECK_ARCHS) <!nocheck>

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