This is an automated email from the git hooks/post-receive script.
rhonda pushed a commit to branch wheezy-backports-sloppy
in repository wesnoth.
commit 70d8ab2c8b270c6debc4b7bde8e9d6591cf58fd2
Author: Rhonda D'Vine <rho...@debian.org>
Date: Thu Apr 23 11:10:49 2015 +0200
Depend on ttf-dejavu
---
debian/changelog | 1 +
debian/control | 2 +-
debian/control.in | 2 +-
debian/rules | 2 +-
debian/wesnoth-1.12-data.lintian-overrides | 2 +-
debian/wesnoth-BRANCH-data.lintian-overrides.in | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 278bfa7..d113157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wesnoth-1.12 (1:1.12.2-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
* Rebuild for wheezy-backports-sloppy.
+ * Depend on ttf-dejavu-core (instead of fonts-dejavu-core) which is in
wheezy.
-- Rhonda D'Vine <rho...@debian.org> Tue, 21 Apr 2015 09:46:12 +0200
diff --git a/debian/control b/debian/control
index 93dc141..74e0b6d 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.12-data
Architecture: all
-Depends: ${misc:Depends}, fonts-dejavu-core
+Depends: ${misc:Depends}, ttf-dejavu-core
Recommends: fonts-droid
Suggests: wesnoth-1.12-music
Description: data files for Wesnoth (branch 1.12)
diff --git a/debian/control.in b/debian/control.in
index b2521dc..c8e88dd 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-core
Recommends: fonts-droid
Suggests: wesnoth-BRANCH-music
Description: data files for Wesnoth (branch BRANCH)
diff --git a/debian/rules b/debian/rules
index 61f67bb..2a893e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,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.12-data.lintian-overrides
b/debian/wesnoth-1.12-data.lintian-overrides
index c292b8c..6f988a7 100644
--- a/debian/wesnoth-1.12-data.lintian-overrides
+++ b/debian/wesnoth-1.12-data.lintian-overrides
@@ -2,6 +2,6 @@
wesnoth-1.12-data: extra-license-file
usr/share/games/wesnoth/1.12/data/COPYING.txt
# 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/DejaVuSans.ttf
/usr/share/fonts/truetype/ttf-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..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
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
