Add lintian overrides for empty /usr/share/doc/openssh-client

directories in openssh-server and ssh (necessary due to being symlink
targets).

6 files changed, 10 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 0d8d3009d..f37500b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -142,6 +142,9 @@ openssh (1:5.1p1-1) UNRELEASED; urgency=low
         platforms.
   * Remove our local version of moduli(5) now that there's one upstream.
   * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
+  * Add lintian overrides for empty /usr/share/doc/openssh-client
+    directories in openssh-server and ssh (necessary due to being symlink
+    targets).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 22 Jul 2008 17:34:06 +0100
 
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index 7cc4c0d84..ebc620ea9 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -3,6 +3,7 @@ etc/default
 etc/network/if-up.d
 usr/lib/openssh
 usr/sbin
+usr/share/lintian/overrides
 usr/share/man/man5
 usr/share/man/man8
 var/run/sshd
diff --git a/debian/openssh-server.lintian b/debian/openssh-server.lintian
new file mode 100644
index 000000000..17d912cb0
--- /dev/null
+++ b/debian/openssh-server.lintian
@@ -0,0 +1 @@
+openssh-server: package-contains-empty-directory usr/share/doc/openssh-client/
diff --git a/debian/rules b/debian/rules
index 5af0907c1..fb3f3a138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -241,6 +241,7 @@ binary-openssh-server: build install
         dh_installdocs
         mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client
         rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright
+        install -m644 debian/openssh-server.lintian debian/openssh-server/usr/share/lintian/overrides/openssh-server
         dh_installpam --name sshd
         dh_link
         dh_strip
@@ -261,9 +262,11 @@ binary-ssh: DH_OPTIONS=-pssh
 binary-ssh: build install
         dh_testdir
         dh_testroot
+        dh_installdirs
         dh_installdocs
         mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client
         rm -f debian/ssh/usr/share/doc/openssh-client/copyright
+        install -m644 debian/ssh.lintian debian/ssh/usr/share/lintian/overrides/ssh
         dh_link
         dh_compress
         dh_fixperms
diff --git a/debian/ssh.dirs b/debian/ssh.dirs
new file mode 100644
index 000000000..1da8fba83
--- /dev/null
+++ b/debian/ssh.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff --git a/debian/ssh.lintian b/debian/ssh.lintian
new file mode 100644
index 000000000..b9bf7ea08
--- /dev/null
+++ b/debian/ssh.lintian
@@ -0,0 +1 @@
+ssh: package-contains-empty-directory usr/share/doc/openssh-client/