summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-06-06 15:17:47 +0100
committerColin Watson <cjwatson@debian.org>2017-06-06 15:17:47 +0100
commitff5d0a9910fc31a9e805afac26ee3f71ba843d2b (patch)
tree1f5ef97b300be07d4e3e1ae041ae8b4698ba44ab
parent3c246c138b9f7fddcb726a8730f20ac7e588bfd0 (diff)
Relicense debian/* under a two-clause BSD licence for bidirectional compatibility with upstream, with permission from Matthew Vernon and others.
-rw-r--r--debian/changelog3
-rw-r--r--debian/copyright44
2 files changed, 23 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index 5010fe0c4..b1f1971a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ openssh (1:7.5p1-4) UNRELEASED; urgency=medium
6 (LP: #1689299). 6 (LP: #1689299).
7 * Fix incoming compression statistics (thanks, Russell Coker; closes: 7 * Fix incoming compression statistics (thanks, Russell Coker; closes:
8 #797964). 8 #797964).
9 * Relicense debian/* under a two-clause BSD licence for bidirectional
10 compatibility with upstream, with permission from Matthew Vernon and
11 others.
9 12
10 -- Colin Watson <cjwatson@debian.org> Wed, 03 May 2017 12:23:16 +0100 13 -- Colin Watson <cjwatson@debian.org> Wed, 03 May 2017 12:23:16 +0100
11 14
diff --git a/debian/copyright b/debian/copyright
index 3822727b3..49fd651d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -241,27 +241,23 @@ License: Expat-with-advertising-restriction
241 241
242Files: debian/* 242Files: debian/*
243Copyright: Matthew Vernon, Colin Watson 243Copyright: Matthew Vernon, Colin Watson
244License: GPL-2 with OpenSSH-linking exception 244License: BSD-2-clause
245 This program is free software; you can redistribute it and/or modify 245 Redistribution and use in source and binary forms, with or without
246 it under the terms of the GNU General Public License as published by 246 modification, are permitted provided that the following conditions
247 the Free Software Foundation; either version 2 of the License, or 247 are met:
248 (at your option) any later version. 248 1. Redistributions of source code must retain the above copyright
249 . 249 notice, this list of conditions and the following disclaimer.
250 This program is distributed in the hope that it will be useful, 250 2. Redistributions in binary form must reproduce the above copyright
251 but WITHOUT ANY WARRANTY; without even the implied warranty of 251 notice, this list of conditions and the following disclaimer in the
252 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 252 documentation and/or other materials provided with the distribution.
253 GNU General Public License for more details. 253
254 . 254 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
255 You should have received a copy of the GNU General Public License along 255 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
256 with this program; if not, write to the Free Software Foundation, Inc., 256 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
257 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 257 IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
258 . 258 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
259 In addition, as a special exception, Matthew Vernon gives permission 259 NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
260 to link the code of the Debian patch with any version of the OpenSSH 260 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
261 code which is distributed under a license identical to that listed in 261 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
262 the included Copyright file, and distribute linked combinations 262 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
263 including the two. You must obey the GNU General Public License in 263 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
264 all respects for all of the code used other than OpenSSH. If you
265 modify this file, you may extend this exception to your version of the
266 file, but you are not obligated to do so. If you do not wish to do
267 so, delete this exception statement from your version.