[wesnoth] 02/02: Revert changes for ttf-dejavu -> fonts-dejavu-core

[Gerfried Fuchs]

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

rhonda pushed a commit to branch wheezy-backports
in repository wesnoth.

commit 6fb5f579917d9f7f5ba40d6004e75c1212cc3046
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Thu Apr 9 23:52:13 2015 +0200

    Revert changes for ttf-dejavu -> fonts-dejavu-core
---
 debian/changelog                                | 7 +++++++
 debian/control                                  | 2 +-
 debian/control.in                               | 2 +-
 debian/rules                                    | 2 +-
 debian/wesnoth-1.10-data.lintian-overrides      | 2 +-
 debian/wesnoth-BRANCH-data.lintian-overrides.in | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bdb645..9f7be5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.10 (1:1.10.7-2~bpo70+1) wheezy-backports; urgency=medium
+
+  * Rebuild for wheezy-backports.
+  * Revert changes for ttf-dejavu -> fonts-dejavu-core which isn't in wheezy.
+
+ -- Rhonda D'Vine <rhonda at debian.org>  Thu, 09 Apr 2015 23:49:59 +0200
+
 wesnoth-1.10 (1:1.10.7-2) unstable; urgency=high
 
   * Pull af61f9fd from upstream to fix "Private file disclosure through
diff --git a/debian/control b/debian/control
index c087f39..9a01a65 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/wesnoth.git
 
 Package: wesnoth-1.10-data
 Architecture: all
-Depends: ${misc:Depends}, fonts-dejavu-core
+Depends: ${misc:Depends}, ttf-dejavu
 Recommends: fonts-droid
 Suggests: wesnoth-1.10-music
 Description: data files for Wesnoth (branch 1.10)
diff --git a/debian/control.in b/debian/control.in
index 645856b..7bdf95a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/wesnoth.git
 
 Package: wesnoth-BRANCH-data
 Architecture: all
-Depends: ${misc:Depends}, fonts-dejavu-core
+Depends: ${misc:Depends}, ttf-dejavu
 Recommends: fonts-droid
 Suggests: wesnoth-BRANCH-music
 Description: data files for Wesnoth (branch BRANCH)
diff --git a/debian/rules b/debian/rules
index 0eddc1f..0eab419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,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 ttf-dejavu/DejaVuSans.ttf droid/DroidSansJapanese.ttf droid/DroidSansFallbackFull.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.10-data.lintian-overrides b/debian/wesnoth-1.10-data.lintian-overrides
index 9f9dc11..7471eaa 100644
--- a/debian/wesnoth-1.10-data.lintian-overrides
+++ b/debian/wesnoth-1.10-data.lintian-overrides
@@ -2,6 +2,6 @@
 wesnoth-1.10-data: extra-license-file usr/share/games/wesnoth/1.10/data/COPYING.txt
 # Manually create symlinks because dh_link has problems with forming relative
 # links; see #461392
-wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf
 wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/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..91e02d9 100644
--- a/debian/wesnoth-BRANCH-data.lintian-overrides.in
+++ b/debian/wesnoth-BRANCH-data.lintian-overrides.in
@@ -2,6 +2,6 @@
 wesnoth-BRANCH-data: extra-license-file usr/share/games/wesnoth/BRANCH/data/COPYING.txt
 # 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/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-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