summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-07-23 06:03:54 +0000
committerColin Watson <cjwatson@debian.org>2008-07-23 06:03:54 +0000
commita7cb4f328d668ec56a138e6d80ee752a257485df (patch)
treefaed6849cb5536825add713cb74d6d9720468dd5 /debian
parent3ea972fe2ff41deaaf8b3fc247538d25572abbf0 (diff)
Add lintian overrides for empty /usr/share/doc/openssh-client
directories in openssh-server and ssh (necessary due to being symlink targets).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/openssh-server.dirs1
-rw-r--r--debian/openssh-server.lintian1
-rwxr-xr-xdebian/rules3
-rw-r--r--debian/ssh.dirs1
-rw-r--r--debian/ssh.lintian1
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
142 platforms. 142 platforms.
143 * Remove our local version of moduli(5) now that there's one upstream. 143 * Remove our local version of moduli(5) now that there's one upstream.
144 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description. 144 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
145 * Add lintian overrides for empty /usr/share/doc/openssh-client
146 directories in openssh-server and ssh (necessary due to being symlink
147 targets).
145 148
146 -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Jul 2008 17:34:06 +0100 149 -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Jul 2008 17:34:06 +0100
147 150
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
3etc/network/if-up.d 3etc/network/if-up.d
4usr/lib/openssh 4usr/lib/openssh
5usr/sbin 5usr/sbin
6usr/share/lintian/overrides
6usr/share/man/man5 7usr/share/man/man5
7usr/share/man/man8 8usr/share/man/man8
8var/run/sshd 9var/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
241 dh_installdocs 241 dh_installdocs
242 mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client 242 mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client
243 rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright 243 rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright
244 install -m644 debian/openssh-server.lintian debian/openssh-server/usr/share/lintian/overrides/openssh-server
244 dh_installpam --name sshd 245 dh_installpam --name sshd
245 dh_link 246 dh_link
246 dh_strip 247 dh_strip
@@ -261,9 +262,11 @@ binary-ssh: DH_OPTIONS=-pssh
261binary-ssh: build install 262binary-ssh: build install
262 dh_testdir 263 dh_testdir
263 dh_testroot 264 dh_testroot
265 dh_installdirs
264 dh_installdocs 266 dh_installdocs
265 mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client 267 mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client
266 rm -f debian/ssh/usr/share/doc/openssh-client/copyright 268 rm -f debian/ssh/usr/share/doc/openssh-client/copyright
269 install -m644 debian/ssh.lintian debian/ssh/usr/share/lintian/overrides/ssh
267 dh_link 270 dh_link
268 dh_compress 271 dh_compress
269 dh_fixperms 272 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/