From 46aac1834a7c8286027365d571b39a3a47524988 Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Fri, 25 Mar 2016 21:45:15 -0700 Subject: [PATCH] debian/control and debian/copyright: Fix lintian warnings --- debian/control | 2 +- debian/copyright | 39 ++++++++------------------------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/debian/control b/debian/control index 0a417d8..f8e3eec 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Keith Winstein Build-Depends: debhelper (>= 7.0.50), autotools-dev, protobuf-compiler, libprotobuf-dev, dh-autoreconf, pkg-config, libutempter-dev, zlib1g-dev, libncurses5-dev, libssl-dev, bash-completion -Standards-Version: 3.9.6.1 +Standards-Version: 3.9.7 Homepage: http://mosh.mit.edu Vcs-Git: https://github.com/mobile-shell/mosh.git Vcs-Browser: https://github.com/mobile-shell/mosh diff --git a/debian/copyright b/debian/copyright index e3c56db..6dec263 100644 --- a/debian/copyright +++ b/debian/copyright @@ -61,7 +61,14 @@ License: GPL-2+ Files: m4/ax_check_library.m4 Copyright: 2010 Diego Elio Petteno` -License: GPL-3+ +License: GPL-3+ with Autoconf exception + +Files: m4/ax_check_compile_flag.m4 m4/ax_check_link_flag.m4 +Copyright: 2008 Guido U. Draheim + 2011 Maarten Bosmans +License: GPL-3+ with Autoconf exception + +License: GPL-3+ with Autoconf 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 3 of the License, or (at your @@ -91,36 +98,6 @@ License: GPL-3+ On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -Files: m4/ax_check_compile_flag.m4 m4/ax_check_link_flag.m4 -Copyright: 2008 Guido U. Draheim - 2011 Maarten Bosmans -License: GPL-3+ - 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 3 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, see . - . - As a special exception, the respective Autoconf Macro's copyright owner - gives unlimited permission to copy, distribute and modify the configure - scripts that are the output of Autoconf when processing the Macro. You - need not follow the terms of the GNU General Public License when using - or distributing such scripts, even though portions of the text of the - Macro appear in them. The GNU General Public License (GPL) does govern - all other use of the material that constitutes the Autoconf Macro. - . - This special exception to the GPL applies to versions of the Autoconf - Macro released by the Autoconf Archive. When you make and distribute a - modified version of the Autoconf Macro, you may extend this special - exception to the GPL to apply to your modified version as well. - Files: src/crypto/ocb.cc Copyright: 2011 Ted Krovetz License: ISC