From 692cef88c7f68af53e9487e3e2264de8d98b230b Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Wed, 7 Mar 2018 14:08:18 +0100 Subject: dissectors: more SPDX license convertions. Change-Id: I96e1f1cdbaaf49d65705ecacc903f73cf0e47d7c Reviewed-on: https://code.wireshark.org/review/26334 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter --- epan/dissectors/asn1/novell_pkis/CMakeLists.txt | 14 +------------- epan/dissectors/asn1/novell_pkis/Makefile.am | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'epan/dissectors/asn1/novell_pkis') diff --git a/epan/dissectors/asn1/novell_pkis/CMakeLists.txt b/epan/dissectors/asn1/novell_pkis/CMakeLists.txt index 2e46c68876..04d4a78461 100644 --- a/epan/dissectors/asn1/novell_pkis/CMakeLists.txt +++ b/epan/dissectors/asn1/novell_pkis/CMakeLists.txt @@ -4,19 +4,7 @@ # By Gerald Combs # Copyright 1998 Gerald Combs # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later # set( PROTOCOL_NAME novell_pkis ) diff --git a/epan/dissectors/asn1/novell_pkis/Makefile.am b/epan/dissectors/asn1/novell_pkis/Makefile.am index 676d13435f..e9df58b190 100644 --- a/epan/dissectors/asn1/novell_pkis/Makefile.am +++ b/epan/dissectors/asn1/novell_pkis/Makefile.am @@ -2,19 +2,7 @@ # By Gerald Combs # Copyright 1998 Gerald Combs # -# 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. +# SPDX-License-Identifier: GPL-2.0-or-later include ../Makefile.inc -- cgit v1.2.3