[libreoffice] 01/04: lp#1276352: [MIR] suggest caladea and carlito for Writer

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 87c10af2ca417650547333a4f87a3deb389a6bc8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Aug 15 15:49:52 2014 +0200

    lp#1276352: [MIR] suggest caladea and carlito for Writer
    
    Conflicts:
    	changelog
    	control.in
---
 changelog  | 3 +++
 control    | 5 ++++-
 control.in | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 26dedc1..9e899e5 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,9 @@ libreoffice (1:4.3.0-3) unstable; urgency=medium
       are handled in libsd (draw) anyway...
   * debian/control.ogltrans.in: clarify a bit: s/transitions/slide &/
 
+  * merge from Ubuntu:
+    - MIR: Caladea and Carlito from Writer for metric compatibilty (LP: #1276252)
+
  -- Rene Engelhard <rene@debian.org>  Sun, 10 Aug 2014 22:36:46 +0200
 
 libreoffice (1:4.3.0-2) unstable; urgency=low
diff --git a/control b/control
index e88c899..409d74f 100644
--- a/control
+++ b/control
@@ -497,7 +497,10 @@ Depends: libreoffice-base-core (= ${binary:Version}),
          ${shlibs:Depends}
 Recommends: libreoffice-math, ${java-common-depends}, ${java-runtime-depends}
 Replaces: libreoffice-core (<< 1:3.3.2-5)
-Suggests: libreoffice-base, libreoffice-gcj
+Suggests: fonts-crosextra-caladea,
+          fonts-crosextra-carlito,
+          libreoffice-base,
+          libreoffice-gcj
 Description: office productivity suite -- word processor
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index c420b0c..49b0ead 100644
--- a/control.in
+++ b/control.in
@@ -336,7 +336,10 @@ Recommends: libreoffice-math,
             ${java-common-depends},
             ${java-runtime-depends}
 Replaces: libreoffice-core (<< 1:3.3.2-5)
-Suggests: libreoffice-base, libreoffice-gcj
+Suggests: fonts-crosextra-caladea,
+          fonts-crosextra-carlito,
+          libreoffice-base,
+          libreoffice-gcj
 Description: office productivity suite -- word processor
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

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