summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules6
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 16d9b2b1b..5706b174b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ openssh (1:4.7p1-1) UNRELEASED; urgency=low
52 * Update moduli(5) to revision 1.11 from OpenBSD CVS. 52 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
53 * Document the non-default options we set as standard in ssh_config(5) and 53 * Document the non-default options we set as standard in ssh_config(5) and
54 sshd_config(5) (closes: #327886, #345628). 54 sshd_config(5) (closes: #327886, #345628).
55 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
55 56
56 -- Colin Watson <cjwatson@debian.org> Sun, 23 Dec 2007 12:53:46 +0000 57 -- Colin Watson <cjwatson@debian.org> Sun, 23 Dec 2007 12:53:46 +0000
57 58
diff --git a/debian/rules b/debian/rules
index de9644e66..b419373c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,7 +259,8 @@ binary-openssh-client: build install
259 dh_testroot 259 dh_testroot
260 dh_installdebconf 260 dh_installdebconf
261 dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html 261 dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html
262 cat debian/copyright.head LICENCE > debian/openssh-client/usr/share/doc/openssh-client/copyright 262 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
263 > debian/openssh-client/usr/share/doc/openssh-client/copyright
263 dh_installchangelogs ChangeLog ChangeLog.gssapi 264 dh_installchangelogs ChangeLog ChangeLog.gssapi
264 install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client 265 install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client
265 dh_strip 266 dh_strip
@@ -338,7 +339,8 @@ binary-ssh-krb5: build install
338 dh_testdir 339 dh_testdir
339 dh_testroot 340 dh_testroot
340 dh_installdocs 341 dh_installdocs
341 cat debian/copyright.head LICENCE > debian/ssh-krb5/usr/share/doc/ssh-krb5/copyright 342 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
343 > debian/ssh-krb5/usr/share/doc/ssh-krb5/copyright
342 dh_installchangelogs ChangeLog ChangeLog.gssapi 344 dh_installchangelogs ChangeLog ChangeLog.gssapi
343 dh_link 345 dh_link
344 dh_compress 346 dh_compress