This is an automated email from the git hooks/post-receive script. vcheng pushed a commit to branch devel in repository wesnoth.
commit 5694f25c978aab3ae081a08da7c8c5466814a512 Author: Vincent Cheng <[email protected]> Date: Tue Apr 5 21:36:08 2016 -0700 drop dependency on fonts-droid --- debian/changelog | 1 + debian/control | 1 - debian/control.in | 1 - debian/rules | 2 +- debian/wesnoth-1.13-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 ebe7d9c..7bcfee5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ wesnoth-1.13 (1:1.13.4-1) experimental; urgency=medium libsdl2-net-dev (>= 2.0.0), libsdl2-ttf-dev (>= 2.0.8), libsdl2-dev (>= 2.0.2). - Refresh patches. + * Drop dependency on fonts-droid. (Closes: #804692) * Bump to Standards-Version 3.9.7. -- Vincent Cheng <[email protected]> Mon, 04 Apr 2016 21:39:20 -0700 diff --git a/debian/control b/debian/control index 32cc45e..8df34c4 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git Package: wesnoth-1.13-data Architecture: all Depends: ${misc:Depends}, fonts-dejavu-core, fonts-dejavu-extra -Recommends: fonts-droid Suggests: wesnoth-1.13-music Description: data files for Wesnoth (branch 1.13) This package contains the sound files and graphics for Wesnoth. It is required diff --git a/debian/control.in b/debian/control.in index 0efd3b4..f71a223 100644 --- a/debian/control.in +++ b/debian/control.in @@ -20,7 +20,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git Package: wesnoth-BRANCH-data Architecture: all Depends: ${misc:Depends}, fonts-dejavu-core, fonts-dejavu-extra -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 ee8430f..5274f16 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 dejavu/DejaVuSans-Bold.ttf dejavu/DejaVuSansMono.ttf dejavu/DejaVuSansMono-Bold.ttf dejavu/DejaVuSans-Oblique.ttf droid/DroidSansJapanese.ttf droid/DroidSansFallbackFull.ttf; \ + for i in dejavu/DejaVuSans.ttf dejavu/DejaVuSans-Bold.ttf dejavu/DejaVuSansMono.ttf dejavu/DejaVuSansMono-Bold.ttf dejavu/DejaVuSans-Oblique.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.13-data.lintian-overrides b/debian/wesnoth-1.13-data.lintian-overrides index ab24b15..2194ebd 100644 --- a/debian/wesnoth-1.13-data.lintian-overrides +++ b/debian/wesnoth-1.13-data.lintian-overrides @@ -3,5 +3,3 @@ wesnoth-1.13-data: extra-license-file usr/share/games/wesnoth/1.13/data/COPYING. # Manually create symlinks because dh_link has problems with forming relative # links; see #461392 wesnoth-1.13-data: symlink-should-be-relative usr/share/games/wesnoth/1.13/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf -wesnoth-1.13-data: symlink-should-be-relative usr/share/games/wesnoth/1.13/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf -wesnoth-1.13-data: symlink-should-be-relative usr/share/games/wesnoth/1.13/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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
