diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/.cvsignore | 1 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | debian/rules | 6 |
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 @@ | |||
1 | *.debhelper | 1 | *.debhelper |
2 | *substvars | 2 | *substvars |
3 | copyright | ||
3 | files | 4 | files |
4 | openssh-client | 5 | openssh-client |
5 | openssh-client-udeb | 6 | 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 | |||
4 | * Fix configure detection of getseuserbyname and | 4 | * Fix configure detection of getseuserbyname and |
5 | get_default_context_with_level (LP: #188136). | 5 | get_default_context_with_level (LP: #188136). |
6 | 6 | ||
7 | [ Colin Watson ] | ||
8 | * Include the autogenerated debian/copyright in the source package. | ||
9 | |||
7 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Feb 2008 09:47:31 +0000 | 10 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Feb 2008 09:47:31 +0000 |
8 | 11 | ||
9 | openssh (1:4.7p1-3) unstable; urgency=low | 12 | 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: | |||
148 | $(MAKE) -C contrib clean | 148 | $(MAKE) -C contrib clean |
149 | rm -f config.log | 149 | rm -f config.log |
150 | rm -f debian/ssh-askpass-gnome.png | 150 | rm -f debian/ssh-askpass-gnome.png |
151 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ | ||
152 | > debian/copyright | ||
151 | dh_clean | 153 | dh_clean |
152 | 154 | ||
153 | install: DH_OPTIONS=-a | 155 | install: DH_OPTIONS=-a |
@@ -213,8 +215,6 @@ binary-openssh-client: build install | |||
213 | dh_testroot | 215 | dh_testroot |
214 | dh_installdebconf | 216 | dh_installdebconf |
215 | dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html | 217 | dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html |
216 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ | ||
217 | > debian/openssh-client/usr/share/doc/openssh-client/copyright | ||
218 | dh_installchangelogs ChangeLog ChangeLog.gssapi | 218 | dh_installchangelogs ChangeLog ChangeLog.gssapi |
219 | install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client | 219 | install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client |
220 | dh_strip | 220 | dh_strip |
@@ -277,8 +277,6 @@ binary-ssh-krb5: build install | |||
277 | dh_testdir | 277 | dh_testdir |
278 | dh_testroot | 278 | dh_testroot |
279 | dh_installdocs | 279 | dh_installdocs |
280 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ | ||
281 | > debian/ssh-krb5/usr/share/doc/ssh-krb5/copyright | ||
282 | dh_installchangelogs ChangeLog ChangeLog.gssapi | 280 | dh_installchangelogs ChangeLog ChangeLog.gssapi |
283 | dh_link | 281 | dh_link |
284 | dh_compress | 282 | dh_compress |