From ff5d0a9910fc31a9e805afac26ee3f71ba843d2b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 6 Jun 2017 15:17:47 +0100 Subject: Relicense debian/* under a two-clause BSD licence for bidirectional compatibility with upstream, with permission from Matthew Vernon and others. --- debian/changelog | 3 +++ debian/copyright | 44 ++++++++++++++++++++------------------------ 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 (LP: #1689299). * Fix incoming compression statistics (thanks, Russell Coker; closes: #797964). + * Relicense debian/* under a two-clause BSD licence for bidirectional + compatibility with upstream, with permission from Matthew Vernon and + others. -- Colin Watson Wed, 03 May 2017 12:23:16 +0100 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 Files: debian/* Copyright: Matthew Vernon, Colin Watson -License: GPL-2 with OpenSSH-linking exception - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - In addition, as a special exception, Matthew Vernon gives permission - to link the code of the Debian patch with any version of the OpenSSH - code which is distributed under a license identical to that listed in - the included Copyright file, and distribute linked combinations - including the two. You must obey the GNU General Public License in - all respects for all of the code used other than OpenSSH. If you - modify this file, you may extend this exception to your version of the - file, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- cgit v1.2.3