[libreoffice] 01/02: clean up dejavu "dependency"

[Rene Engelhard]

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

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

commit d6771734f7c9b680ec96e73090ea7ef00deee168
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon May 22 13:23:53 2017 +0200

    clean up dejavu "dependency"
---
 changelog  | 2 ++
 control    | 2 +-
 control.in | 2 +-
 rules      | 3 ---
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index ffc99ba..d870b9e 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
       flags also if building no -dbgsym
   * debian/control.in:
     - remove obsolete Pre-Depends
+  * debian/rules, debian/control.in: remove now unneeded dejavu-depends substvar,
+    simply use fonts-dejavu. Move from Depends: to Recommends: like the other fonts
 
  -- Rene Engelhard <rene at debian.org>  Sat, 20 May 2017 14:32:02 +0200
 
diff --git a/control b/control
index f3d5168..fe0e84e 100644
--- a/control
+++ b/control
@@ -201,11 +201,11 @@ Depends: libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
          libreoffice-report-builder-bin [!hppa !ia64 !mips64 !s390 !sparc],
          libreoffice-writer,
          ${avmedia-be-depends},
-         ${dejavu-depends},
          ${misc:Depends},
          ${pyuno-depends}
 Recommends: fonts-crosextra-caladea,
             fonts-crosextra-carlito,
+            fonts-dejavu,
             fonts-linuxlibertine,
             fonts-open-sans,
             fonts-sil-gentium-basic,
diff --git a/control.in b/control.in
index ea5d994..20a59cb 100644
--- a/control.in
+++ b/control.in
@@ -40,13 +40,13 @@ Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
          libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
          libreoffice-writer,
          ${avmedia-be-depends},
-         ${dejavu-depends},
          ${misc:Depends},
          ${pyuno-depends}
 Recommends: ${java-common-depends},
             fonts-sil-gentium-basic,
             fonts-crosextra-caladea,
             fonts-crosextra-carlito,
+            fonts-dejavu,
             fonts-linuxlibertine,
             fonts-open-sans,
             libreoffice-script-provider-bsh,
diff --git a/rules b/rules
index 5846326..126962a 100755
--- a/rules
+++ b/rules
@@ -1525,8 +1525,6 @@ ifeq ($(USE_GOLD),y)
 export DEB_LDFLAGS_MAINT_APPEND
 endif
 
-DEJAVU_DEPENDS=fonts-dejavu
-
 # Use compiler cache?  Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
 # A complete build uses about 9G of compiler cache.
 ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@ -3349,7 +3347,6 @@ endif
 		-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
 		-V'pyuno-depends=$(PYUNO_DEPENDS)' \
 		-V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \
-		-V'dejavu-depends=$(DEJAVU_DEPENDS)' \
 		-V'opencl-sug=$(OPENCL_SUGGESTS)' \
 		-V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
 		-V'python-six-recommends=$(PYTHON_SIX_RECOMMENDS)' \

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