[wesnoth] 04/04: drop dependency on fonts-droid

[Vincent Cheng]

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

vcheng pushed a commit to branch master
in repository wesnoth.

commit a154a1f361569e36c8eac4d0c085959e317cfafd
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Apr 5 21:53:24 2016 -0700

    drop dependency on fonts-droid
---
 debian/changelog                                | 1 +
 debian/control                                  | 1 -
 debian/control.in                               | 1 -
 debian/rules                                    | 2 +-
 debian/wesnoth-1.12-data.lintian-overrides      | 2 --
 debian/wesnoth-BRANCH-data.lintian-overrides.in | 2 --
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567e975..c50d00c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 wesnoth-1.12 (1:1.12.5-2) UNRELEASED; urgency=medium
 
+  * Drop dependency on fonts-droid. (Closes: #804691)
   * Bump to Standards-Version 3.9.7.
 
  -- Vincent Cheng <vcheng at debian.org>  Tue, 05 Apr 2016 21:46:06 -0700
diff --git a/debian/control b/debian/control
index 1b48f14..641da14 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git
 Package: wesnoth-1.12-data
 Architecture: all
 Depends: ${misc:Depends}, fonts-dejavu-core
-Recommends: fonts-droid
 Suggests: wesnoth-1.12-music
 Description: data files for Wesnoth (branch 1.12)
  This package contains the sound files and graphics for Wesnoth. It is required
diff --git a/debian/control.in b/debian/control.in
index 743ce80..ea11ee8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git
 Package: wesnoth-BRANCH-data
 Architecture: all
 Depends: ${misc:Depends}, fonts-dejavu-core
-Recommends: fonts-droid
 Suggests: wesnoth-BRANCH-music
 Description: data files for Wesnoth (branch BRANCH)
  This package contains the sound files and graphics for Wesnoth. It is required
diff --git a/debian/rules b/debian/rules
index b40455f..d299084 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@ binary-common:
 # Build architecture independant packages using the common target.
 binary-indep: install
 	# workaround for dh_link (mis)behavior, see BTS#445550
-	for i in dejavu/DejaVuSans.ttf droid/DroidSansJapanese.ttf droid/DroidSansFallbackFull.ttf; \
+	for i in dejavu/DejaVuSans.ttf; \
 		do ln -s /usr/share/fonts/truetype/$$i \
 	       	debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/`basename $$i`; \
 		done
diff --git a/debian/wesnoth-1.12-data.lintian-overrides b/debian/wesnoth-1.12-data.lintian-overrides
index c292b8c..1a94c9c 100644
--- a/debian/wesnoth-1.12-data.lintian-overrides
+++ b/debian/wesnoth-1.12-data.lintian-overrides
@@ -3,5 +3,3 @@ wesnoth-1.12-data: extra-license-file usr/share/games/wesnoth/1.12/data/COPYING.
 # Manually create symlinks because dh_link has problems with forming relative
 # links; see #461392
 wesnoth-1.12-data: symlink-should-be-relative usr/share/games/wesnoth/1.12/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
-wesnoth-1.12-data: symlink-should-be-relative usr/share/games/wesnoth/1.12/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf
-wesnoth-1.12-data: symlink-should-be-relative usr/share/games/wesnoth/1.12/fonts/DroidSansJapanese.ttf /usr/share/fonts/truetype/droid/DroidSansJapanese.ttf
diff --git a/debian/wesnoth-BRANCH-data.lintian-overrides.in b/debian/wesnoth-BRANCH-data.lintian-overrides.in
index 8a3fb38..a754f00 100644
--- a/debian/wesnoth-BRANCH-data.lintian-overrides.in
+++ b/debian/wesnoth-BRANCH-data.lintian-overrides.in
@@ -3,5 +3,3 @@ wesnoth-BRANCH-data: extra-license-file usr/share/games/wesnoth/BRANCH/data/COPY
 # Manually create symlinks because dh_link has problems with forming relative
 # links; see #461392
 wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
-wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf
-wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansJapanese.ttf /usr/share/fonts/truetype/droid/DroidSansJapanese.ttf

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