summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules3
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d7abfdf3..d06858883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ openssh (1:3.8p1-4) UNRELEASED; urgency=low
2 2
3 * Make sure there's a newline at the end of sshd_config before adding 3 * Make sure there's a newline at the end of sshd_config before adding
4 'UsePAM yes' (closes: #244829). 4 'UsePAM yes' (closes: #244829).
5 * Remove /usr/share/doc/ssh/RFC.gz from the ssh binary package (although
6 it's still in the source, so this only addresses part of #211640 rather
7 than closing it). It isn't DFSG-free and only documents the obsolete
8 SSH1 protocol, not to mention that it was never a real RFC but only an
9 Internet-Draft. It's available from
10 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
11 it for some reason.
5 12
6 -- Colin Watson <cjwatson@debian.org> Tue, 20 Apr 2004 08:48:53 +0100 13 -- Colin Watson <cjwatson@debian.org> Tue, 20 Apr 2004 08:48:53 +0100
7 14
diff --git a/debian/rules b/debian/rules
index 8cc9b5d9c..0575bfc94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,9 +130,6 @@ endif
130 dh_installdebconf 130 dh_installdebconf
131 dh_installdocs OVERVIEW README 131 dh_installdocs OVERVIEW README
132 cat debian/copyright.head LICENCE > debian/tmp/usr/share/doc/ssh/copyright 132 cat debian/copyright.head LICENCE > debian/tmp/usr/share/doc/ssh/copyright
133 nroff RFC.nroff > debian/tmp/usr/share/doc/ssh/RFC
134 gzip -9 debian/tmp/usr/share/doc/ssh/RFC
135 rm -rf debian/tmp/usr/share/doc/ssh/RFC.nroff.gz
136ifeq ($(PAMSUBST),yes) 133ifeq ($(PAMSUBST),yes)
137 # Clean up if we've done this already, to ensure idempotency. 134 # Clean up if we've done this already, to ensure idempotency.
138 if [ -f debian/ssh.pam.new-style ]; then \ 135 if [ -f debian/ssh.pam.new-style ]; then \