[freeciv] 02/20: Link all client man pages against freeciv-client.6 again.

[Markus Koschany]

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

apo-guest pushed a commit to branch experimental
in repository freeciv.

commit a650bb9cd1193484ab31b5898cea0023a652fa4f
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Apr 13 12:54:39 2015 +0200

    Link all client man pages against freeciv-client.6 again.
    
    This reverts the change from the previous upload. Lintian overrides are no
    longer necessary then.
---
 debian/freeciv-client-gtk.install           | 1 -
 debian/freeciv-client-gtk.links             | 1 +
 debian/freeciv-client-gtk.lintian-overrides | 4 ----
 debian/freeciv-client-qt.install            | 1 -
 debian/freeciv-client-qt.links              | 1 +
 debian/freeciv-client-qt.lintian-overrides  | 3 ---
 debian/freeciv-client-sdl.install           | 1 -
 debian/freeciv-client-sdl.links             | 1 +
 debian/freeciv-client-sdl.lintian-overrides | 4 ----
 debian/rules                                | 3 +++
 10 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian/freeciv-client-gtk.install b/debian/freeciv-client-gtk.install
index c80cd15..c4ec3f9 100644
--- a/debian/freeciv-client-gtk.install
+++ b/debian/freeciv-client-gtk.install
@@ -1,3 +1,2 @@
 usr/games/freeciv-gtk2
 usr/share/applications/freeciv-gtk2.desktop
-usr/share/man/man6/freeciv-gtk2.6
diff --git a/debian/freeciv-client-gtk.links b/debian/freeciv-client-gtk.links
index 330e0d0..c03252b 100644
--- a/debian/freeciv-client-gtk.links
+++ b/debian/freeciv-client-gtk.links
@@ -1 +1,2 @@
 /usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-gtk
+/usr/share/man/man6/freeciv-client.6.gz /usr/share/man/man6/freeciv-gtk2.6.gz
diff --git a/debian/freeciv-client-gtk.lintian-overrides b/debian/freeciv-client-gtk.lintian-overrides
deleted file mode 100644
index f7a18bc..0000000
--- a/debian/freeciv-client-gtk.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# The man pages import all information from freeciv-client.6 in freeciv-data
-# Hence this is not a bug
-manpage-has-bad-whatis-entry
-manpage-has-errors-from-man
diff --git a/debian/freeciv-client-qt.install b/debian/freeciv-client-qt.install
index 1c24a80..ae92e14 100644
--- a/debian/freeciv-client-qt.install
+++ b/debian/freeciv-client-qt.install
@@ -1,3 +1,2 @@
 usr/games/freeciv-qt
 usr/share/applications/freeciv-qt.desktop
-usr/share/man/man6/freeciv-qt.6
diff --git a/debian/freeciv-client-qt.links b/debian/freeciv-client-qt.links
index a28a313..561db1d 100644
--- a/debian/freeciv-client-qt.links
+++ b/debian/freeciv-client-qt.links
@@ -1 +1,2 @@
 /usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-qt
+/usr/share/man/man6/freeciv-client.6.gz /usr/share/man/man6/freeciv-qt.6.gz
diff --git a/debian/freeciv-client-qt.lintian-overrides b/debian/freeciv-client-qt.lintian-overrides
deleted file mode 100644
index 58a9179..0000000
--- a/debian/freeciv-client-qt.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# The man pages import all information from freeciv-client.6 in freeciv-data
-# Hence this is not a bug
-manpage-has-bad-whatis-entry
diff --git a/debian/freeciv-client-sdl.install b/debian/freeciv-client-sdl.install
index e5c09c0..9f44425 100644
--- a/debian/freeciv-client-sdl.install
+++ b/debian/freeciv-client-sdl.install
@@ -1,3 +1,2 @@
 usr/games/freeciv-sdl
 usr/share/applications/freeciv-sdl.desktop
-usr/share/man/man6/freeciv-sdl.6
diff --git a/debian/freeciv-client-sdl.links b/debian/freeciv-client-sdl.links
index c232ebc..64628d2 100644
--- a/debian/freeciv-client-sdl.links
+++ b/debian/freeciv-client-sdl.links
@@ -1 +1,2 @@
 /usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-sdl
+/usr/share/man/man6/freeciv-client.6.gz /usr/share/man/man6/freeciv-sdl.6.gz
diff --git a/debian/freeciv-client-sdl.lintian-overrides b/debian/freeciv-client-sdl.lintian-overrides
deleted file mode 100644
index f7a18bc..0000000
--- a/debian/freeciv-client-sdl.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# The man pages import all information from freeciv-client.6 in freeciv-data
-# Hence this is not a bug
-manpage-has-bad-whatis-entry
-manpage-has-errors-from-man
diff --git a/debian/rules b/debian/rules
index 2c8b6c8..4d4ce82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,10 @@ override_dh_install:
 	# Move stuff that gets lost thanks to ${datadir}
 	mv debian/tmp/usr/share/games/icons debian/tmp/usr/share
 	# Delete man pages which are unneeded.
+	rm -f debian/tmp/usr/share/man/man6/freeciv-gtk2.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-gtk3.6
+	rm -f debian/tmp/usr/share/man/man6/freeciv-sdl.6
+	rm -f debian/tmp/usr/share/man/man6/freeciv-qt.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-xaw.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-manual.6
 	rm -f debian/tmp/usr/share/man/man6/freeciv-mp-cli.6

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