diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-12 12:27:44 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-12 12:27:44 +0000 |
commit | 54ee8007e8f03583d54c175da2cf2a8fc2123e5c (patch) | |
tree | 9eed658603164ed56de97e9f9f29d8ce3de38170 /debian | |
parent | a7ab96dac4597c0c34ffe22a5d92a83a2e579edf (diff) |
Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the Debian patch) rather than plain GPL.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/copyright.head | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a4af41d36..4c8c8981d 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -14,6 +14,8 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium | |||
14 | Upstart job and the systemd service files; it's there to avoid a | 14 | Upstart job and the systemd service files; it's there to avoid a |
15 | confusing failure mode in daemon(), but with modern init systems we use | 15 | confusing failure mode in daemon(), but with modern init systems we use |
16 | the -D option to suppress daemonisation anyway. | 16 | the -D option to suppress daemonisation anyway. |
17 | * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the | ||
18 | Debian patch) rather than plain GPL. | ||
17 | 19 | ||
18 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 | 20 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 |
19 | 21 | ||
diff --git a/debian/copyright.head b/debian/copyright.head index c59278825..bf1ab0ea2 100644 --- a/debian/copyright.head +++ b/debian/copyright.head | |||
@@ -11,7 +11,7 @@ The Debian-specific parts of the package were initially derived from the | |||
11 | original ssh package, which has since been renamed as ssh-nonfree. | 11 | original ssh package, which has since been renamed as ssh-nonfree. |
12 | 12 | ||
13 | The Debian patch is distributed under the terms of the GPL, which you | 13 | The Debian patch is distributed under the terms of the GPL, which you |
14 | can find in /usr/share/common-licenses/GPL. | 14 | can find in /usr/share/common-licenses/GPL-2. |
15 | 15 | ||
16 | In addition, as a special exception, Matthew Vernon gives permission | 16 | In addition, as a special exception, Matthew Vernon gives permission |
17 | to link the code of the Debian patch with any version of the OpenSSH | 17 | to link the code of the Debian patch with any version of the OpenSSH |