* Recode LICENCE to UTF-8 when concatenating it to debian/copyright.

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
   * Update moduli(5) to revision 1.11 from OpenBSD CVS.
   * Document the non-default options we set as standard in ssh_config(5) and
     sshd_config(5) (closes: #327886, #345628).
+  * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 23 Dec 2007 12:53:46 +0000
 
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
         dh_testroot
         dh_installdebconf
         dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html
-        cat debian/copyright.head LICENCE > debian/openssh-client/usr/share/doc/openssh-client/copyright
+        (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
+                > debian/openssh-client/usr/share/doc/openssh-client/copyright
         dh_installchangelogs ChangeLog ChangeLog.gssapi
         install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client
         dh_strip
@@ -338,7 +339,8 @@ binary-ssh-krb5: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        cat debian/copyright.head LICENCE > debian/ssh-krb5/usr/share/doc/ssh-krb5/copyright
+        (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
+                > debian/ssh-krb5/usr/share/doc/ssh-krb5/copyright
         dh_installchangelogs ChangeLog ChangeLog.gssapi
         dh_link
         dh_compress