From 54ee8007e8f03583d54c175da2cf2a8fc2123e5c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 12 Feb 2014 12:27:44 +0000 Subject: Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the Debian patch) rather than plain GPL. --- debian/changelog | 2 ++ debian/copyright.head | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 Upstart job and the systemd service files; it's there to avoid a confusing failure mode in daemon(), but with modern init systems we use the -D option to suppress daemonisation anyway. + * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the + Debian patch) rather than plain GPL. -- Colin Watson Tue, 11 Feb 2014 21:36:14 +0000 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 original ssh package, which has since been renamed as ssh-nonfree. The Debian patch is distributed under the terms of the GPL, which you -can find in /usr/share/common-licenses/GPL. +can find in /usr/share/common-licenses/GPL-2. In addition, as a special exception, Matthew Vernon gives permission to link the code of the Debian patch with any version of the OpenSSH -- cgit v1.2.3