diff options
| -rw-r--r-- | .pc/binutils-version-matching/.timestamp | 0 | ||||
| -rw-r--r-- | .pc/sbsigntool-not-pesign/.timestamp | 0 | ||||
| -rw-r--r-- | .pc/second-stage-path/.timestamp | 0 | ||||
| -rw-r--r-- | .pc/unused-variable/.timestamp | 0 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/copyright | 18 |
6 files changed, 9 insertions, 16 deletions
diff --git a/.pc/binutils-version-matching/.timestamp b/.pc/binutils-version-matching/.timestamp deleted file mode 100644 index e69de29b..00000000 --- a/.pc/binutils-version-matching/.timestamp +++ /dev/null diff --git a/.pc/sbsigntool-not-pesign/.timestamp b/.pc/sbsigntool-not-pesign/.timestamp deleted file mode 100644 index e69de29b..00000000 --- a/.pc/sbsigntool-not-pesign/.timestamp +++ /dev/null diff --git a/.pc/second-stage-path/.timestamp b/.pc/second-stage-path/.timestamp deleted file mode 100644 index e69de29b..00000000 --- a/.pc/second-stage-path/.timestamp +++ /dev/null diff --git a/.pc/unused-variable/.timestamp b/.pc/unused-variable/.timestamp deleted file mode 100644 index e69de29b..00000000 --- a/.pc/unused-variable/.timestamp +++ /dev/null diff --git a/debian/changelog b/debian/changelog index f0d3a7ba..00934820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ -shim (0.9+1465500757.14a5905-0ubuntu2) yakkety; urgency=medium +shim (0.9+1465500757.14a5905-0ubuntu2) UNRELEASED; urgency=medium + [ Helen Koike ] * debian/copyright: add OpenSSL license + [ Mathieu Trudel-Lapierre ] + * debian/copyright: patches should be BSD, like the rest of the upstream + code. + -- Helen Koike <helen.koike@collabora.com> Wed, 14 Sep 2016 16:34:52 -0300 shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; urgency=medium diff --git a/debian/copyright b/debian/copyright index cc58f066..c679517d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,21 +5,7 @@ Source: https://github.com/mjg59/shim.git Files: debian/patches/* Copyright: 2016 Canonical Ltd. -License: GPL-2 - 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; version 2. - . - This package 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, see <http://www.gnu.org/licenses/> - . - On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL-2'. +License: BSD-2-Clause Files: Cryptlib/OpenSSL/* Cryptlib/Include/openssl/* Copyright: 1998-2016 The OpenSSL Project @@ -135,6 +121,8 @@ Files: * Copyright: 2012 Red Hat, Inc 2009-2012 Intel Corporation License: BSD-2-Clause + +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: |