* move man pages from daemon packages to exim4-base, add lintian

    overrides to allow daemon packages not to contain man pages. Linda
    overrides are currently a challenge.


svn path=/exim/trunk/; revision=1340

7 files changed, 24 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 1773147..e959274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,8 +44,11 @@ exim4 (4.60-2) unstable; urgency=low
   * use dh_installinit -n instead of --noscripts to work around #347577. (mh)
   * use dh_installinit --name instead of --init-script, rename init
     script. (mh)
+  * move man pages from daemon packages to exim4-base, add lintian
+    overrides to allow daemon packages not to contain man pages. Linda
+    overrides are currently a challenge.
 
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Thu, 12 Jan 2006 00:42:16 +0000
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Thu, 12 Jan 2006 00:45:00 +0000
 
 exim4 (4.60-1) unstable; urgency=low
 
diff --git a/debian/exim4-base.links b/debian/exim4-base.links
index eb0ad89..2cd7dbe 100644
--- a/debian/exim4-base.links
+++ b/debian/exim4-base.links
@@ -1,3 +1,9 @@
 usr/share/man/man8/exim_db.8.gz usr/share/man/man8/exim_dumpdb.8.gz
 usr/share/man/man8/exim_db.8.gz usr/share/man/man8/exim_fixdb.8.gz
 usr/share/man/man8/exim_db.8.gz usr/share/man/man8/exim_tidydb.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/sendmail.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/runq.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/rmail.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/rsmtp.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/mailq.8.gz
+usr/share/man/man8/exim.8.gz usr/share/man/man8/newaliases.8.gz
diff --git a/debian/exim4-daemon-custom.links b/debian/exim4-daemon-custom.links
index 5865d54..4d56430 100644
--- a/debian/exim4-daemon-custom.links
+++ b/debian/exim4-daemon-custom.links
@@ -8,11 +8,5 @@ usr/sbin/exim4 usr/sbin/rmail
 usr/sbin/exim4 usr/sbin/rsmtp
 usr/sbin/exim4 usr/bin/mailq
 usr/sbin/exim4 usr/bin/newaliases
-usr/share/man/man8/exim.8.gz usr/share/man/man8/sendmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/runq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rsmtp.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/mailq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/newaliases.8.gz
 usr/share/doc/exim4-base/changelog.gz usr/share/doc/exim4-daemon-custom/changelog.gz
 usr/share/doc/exim4-base/README.Debian.gz usr/share/doc/exim4-daemon-custom/README.Debian.gz
diff --git a/debian/exim4-daemon-heavy.links b/debian/exim4-daemon-heavy.links
index 8931e05..8528f30 100644
--- a/debian/exim4-daemon-heavy.links
+++ b/debian/exim4-daemon-heavy.links
@@ -8,11 +8,5 @@ usr/sbin/exim4 usr/sbin/rmail
 usr/sbin/exim4 usr/sbin/rsmtp
 usr/sbin/exim4 usr/bin/mailq
 usr/sbin/exim4 usr/bin/newaliases
-usr/share/man/man8/exim.8.gz usr/share/man/man8/sendmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/runq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rsmtp.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/mailq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/newaliases.8.gz
 usr/share/doc/exim4-base/changelog.gz usr/share/doc/exim4-daemon-heavy/changelog.gz
 usr/share/doc/exim4-base/README.Debian.gz usr/share/doc/exim4-daemon-heavy/README.Debian.gz
diff --git a/debian/exim4-daemon-light.links b/debian/exim4-daemon-light.links
index c65450e..a959d1a 100644
--- a/debian/exim4-daemon-light.links
+++ b/debian/exim4-daemon-light.links
@@ -8,11 +8,5 @@ usr/sbin/exim4 usr/sbin/rmail
 usr/sbin/exim4 usr/sbin/rsmtp
 usr/sbin/exim4 usr/bin/mailq
 usr/sbin/exim4 usr/bin/newaliases
-usr/share/man/man8/exim.8.gz usr/share/man/man8/sendmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/runq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rmail.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/rsmtp.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/mailq.8.gz
-usr/share/man/man8/exim.8.gz usr/share/man/man8/newaliases.8.gz
 usr/share/doc/exim4-base/changelog.gz usr/share/doc/exim4-daemon-light/changelog.gz
 usr/share/doc/exim4-base/README.Debian.gz usr/share/doc/exim4-daemon-light/README.Debian.gz
diff --git a/debian/lintian/overrides/exim4-daemon-heavy b/debian/lintian/overrides/exim4-daemon-heavy
index a78adc9..bb609f3 100644
--- a/debian/lintian/overrides/exim4-daemon-heavy
+++ b/debian/lintian/overrides/exim4-daemon-heavy
@@ -1,2 +1,9 @@
 exim4-daemon-heavy: setuid-binary usr/sbin/exim4 4755 root/root
 exim4-daemon-heavy: changelog-not-compressed-with-max-compression changelog.gz
+exim4-daemon-heavy: binary-without-manpage exim
+exim4-daemon-heavy: binary-without-manpage mailq
+exim4-daemon-heavy: binary-without-manpage newaliases
+exim4-daemon-heavy: binary-without-manpage rmail
+exim4-daemon-heavy: binary-without-manpage rsmtp
+exim4-daemon-heavy: binary-without-manpage runq
+exim4-daemon-heavy: binary-without-manpage sendmail
diff --git a/debian/lintian/overrides/exim4-daemon-light b/debian/lintian/overrides/exim4-daemon-light
index 305ec52..e6eff56 100644
--- a/debian/lintian/overrides/exim4-daemon-light
+++ b/debian/lintian/overrides/exim4-daemon-light
@@ -1,2 +1,9 @@
 exim4-daemon-light: setuid-binary usr/sbin/exim4 4755 root/root
 exim4-daemon-light: changelog-not-compressed-with-max-compression changelog.gz
+exim4-daemon-light: binary-without-manpage exim
+exim4-daemon-light: binary-without-manpage mailq
+exim4-daemon-light: binary-without-manpage newaliases
+exim4-daemon-light: binary-without-manpage rmail
+exim4-daemon-light: binary-without-manpage rsmtp
+exim4-daemon-light: binary-without-manpage runq
+exim4-daemon-light: binary-without-manpage sendmail