* Include the autogenerated debian/copyright in the source package.

3 files changed, 6 insertions, 4 deletions

diff --git a/debian/.cvsignore b/debian/.cvsignore
index 7b53dba8f..9200ad8b9 100644
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,5 +1,6 @@
 *.debhelper
 *substvars
+copyright
 files
 openssh-client
 openssh-client-udeb
diff --git a/debian/changelog b/debian/changelog
index 765aa9584..8b1f8d856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ openssh (1:4.7p1-4) UNRELEASED; urgency=low
   * Fix configure detection of getseuserbyname and
     get_default_context_with_level (LP: #188136).
 
+  [ Colin Watson ]
+  * Include the autogenerated debian/copyright in the source package.
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 04 Feb 2008 09:47:31 +0000
 
 openssh (1:4.7p1-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 7b6138d8d..964f320cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,6 +148,8 @@ clean:
         $(MAKE) -C contrib clean
         rm -f config.log
         rm -f debian/ssh-askpass-gnome.png
+        (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
+                > debian/copyright
         dh_clean
 
 install: DH_OPTIONS=-a
@@ -213,8 +215,6 @@ binary-openssh-client: build install
         dh_testroot
         dh_installdebconf
         dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html
-        (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
@@ -277,8 +277,6 @@ binary-ssh-krb5: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        (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