[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.10.2-1-7-g686a8fe

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit c8be2b6d517a368749c4849c07775a55918c8b32
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Mon Jun 11 09:25:22 2012 +0200

    Update lintian overrides files

diff --git a/debian/changelog b/debian/changelog
index 9d97e81..05b639b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
   * New upstream stable release (closes: #676460)
   * Remove divert handling which was for wesnoth 1.6 (LP: #999378)
   * Update package descriptions with data from campaigns (closes: #675170)
+  * Update lintian overrides files.
 
  -- 
 
diff --git a/debian/wesnoth-1.10-core.lintian-overrides b/debian/wesnoth-1.10-core.lintian-overrides
index 37dc736..7663963 100644
--- a/debian/wesnoth-1.10-core.lintian-overrides
+++ b/debian/wesnoth-1.10-core.lintian-overrides
@@ -2,4 +2,3 @@ wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/
 wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10-smallgui.6.gz
 wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10.6.gz
 wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10_editor.6.gz
-wesnoth-1.10-core: diversion-for-unknown-file usr/share/man/*/man6/wesnoth.6.gz postinst:25
diff --git a/debian/wesnoth-1.10-data.lintian-overrides b/debian/wesnoth-1.10-data.lintian-overrides
index 03a66ad..a326f93 100644
--- a/debian/wesnoth-1.10-data.lintian-overrides
+++ b/debian/wesnoth-1.10-data.lintian-overrides
@@ -1,5 +1,4 @@
 wesnoth-1.10-data: extra-license-file usr/share/games/wesnoth/1.10/data/COPYING.txt
 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/wqy-zenhei.ttc /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
-wesnoth-1.10-data: package-contains-broken-symlink usr/share/games/wesnoth/1.10/fonts/DejaVuSans.ttf usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-wesnoth-1.10-data: package-contains-broken-symlink usr/share/games/wesnoth/1.10/fonts/wqy-zenhei.ttc usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
+wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallback.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-1.10.lintian-overrides b/debian/wesnoth-1.10.lintian-overrides
new file mode 100644
index 0000000..1639213
--- /dev/null
+++ b/debian/wesnoth-1.10.lintian-overrides
@@ -0,0 +1 @@
+wesnoth-1.10: empty-binary-package
diff --git a/debian/wesnoth-BRANCH-core.lintian-overrides.in b/debian/wesnoth-BRANCH-core.lintian-overrides.in
index f278d8a..f3866ff 100644
--- a/debian/wesnoth-BRANCH-core.lintian-overrides.in
+++ b/debian/wesnoth-BRANCH-core.lintian-overrides.in
@@ -2,4 +2,3 @@ wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH-smallgui.6.gz
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH.6.gz
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH_editor.6.gz
-wesnoth-BRANCH-core: diversion-for-unknown-file usr/share/man/*/man6/wesnoth.6.gz postinst:25
diff --git a/debian/wesnoth-BRANCH-data.lintian-overrides.in b/debian/wesnoth-BRANCH-data.lintian-overrides.in
index b8dec17..a16d3a6 100644
--- a/debian/wesnoth-BRANCH-data.lintian-overrides.in
+++ b/debian/wesnoth-BRANCH-data.lintian-overrides.in
@@ -1,5 +1,4 @@
 wesnoth-BRANCH-data: extra-license-file usr/share/games/wesnoth/BRANCH/data/COPYING.txt
 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/wqy-zenhei.ttc /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
-wesnoth-BRANCH-data: package-contains-broken-symlink usr/share/games/wesnoth/BRANCH/fonts/DejaVuSans.ttf usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-wesnoth-BRANCH-data: package-contains-broken-symlink usr/share/games/wesnoth/BRANCH/fonts/wqy-zenhei.ttc usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
+wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallback.ttf
+wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansJapanese.ttf /usr/share/fonts/truetype/droid/DroidSansJapanese.ttf
diff --git a/debian/wesnoth-BRANCH.lintian-overrides.in b/debian/wesnoth-BRANCH.lintian-overrides.in
new file mode 100644
index 0000000..1ced3c8
--- /dev/null
+++ b/debian/wesnoth-BRANCH.lintian-overrides.in
@@ -0,0 +1 @@
+wesnoth-BRANCH: empty-binary-package

-- 
Debian packaging of wesnoth