[mapproxy] 15/28: Use DejaVu fonts from fonts-dejavu-core package.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapproxy.

commit ef96ac4b0d9b5d0b8e600392b07b71c31245bea2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 26 03:58:37 2016 +0200

    Use DejaVu fonts from fonts-dejavu-core package.
---
 debian/changelog |  1 +
 debian/control   | 10 ++++------
 debian/rules     | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a085f0b..722ef21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ mapproxy (1.8.2-1) UNRELEASED; urgency=medium
   * Install commandline utilities in separate package.
   * Add separate package for Sphinx documentation.
   * Add missing sources for OpenLayers.js 2.12.
+  * Use DejaVu fonts from fonts-dejavu-core package.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 25 Jul 2016 18:53:14 +0200
 
diff --git a/debian/control b/debian/control
index faa09b8..6fa0350 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,11 @@ Description: open source proxy for geospatial data
 
 Package: python-mapproxy
 Architecture: all
-Depends: python-pil,
+Depends: fonts-dejavu-core,
+         python-pil,
          python-pkg-resources,
          python-pyproj,
          python-yaml,
-         ttf-dejavu,
-         ttf-dejavu-extra,
          ${python:Depends},
          ${misc:Depends}
 Recommends: python-gdal,
@@ -81,12 +80,11 @@ Description: open source proxy for geospatial data - Python 2 module
 
 Package: python3-mapproxy
 Architecture: all
-Depends: python3-pil,
+Depends: fonts-dejavu-core,
+         python3-pil,
          python3-pkg-resources,
          python3-pyproj,
          python3-yaml,
-         ttf-dejavu,
-         ttf-dejavu-extra,
          ${python3:Depends},
          ${misc:Depends}
 Recommends: python3-gdal,
diff --git a/debian/rules b/debian/rules
index bf1307c..5c84796 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,25 @@ override_dh_auto_test:
 override_dh_auto_install:
 	PYBUILD_INSTALL_ARGS="--install-scripts=/usr/lib/{package}" dh_auto_install
 
+	# Remove duplicate license file
+	$(RM) debian/*/usr/lib/python*/dist-packages/mapproxy/image/fonts/LICENSE
+
+	for V in `pyversions -v -s`; do \
+		for F in DejaVuSans.ttf DejaVuSansMono.ttf; do \
+			$(RM) debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
+			ln -s /usr/share/fonts/truetype/dejavu/$$F \
+			      debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
+		done ; \
+	done
+
+	for V in `py3versions -v -s`; do \
+		for F in DejaVuSans.ttf DejaVuSansMono.ttf; do \
+			$(RM) debian/python3-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
+			ln -s /usr/share/fonts/truetype/dejavu/$$F \
+			      debian/python3-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
+		done ; \
+	done
+
 override_dh_install:
 	dh_install --list-missing
 

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