From 127ab70dec9bed14f1c310bc8ac669b48266537a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 3 Jul 2019 21:51:03 +0200 Subject: [PATCH] TT#61954 Reorder and reformat copyright File stanzas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As per the spec, the more general one should come first, and the more specific ones latter. Expand © to Copyright too, and place file entries on their own line. Change-Id: Ic0832aa19c76a500b827e06ff7e4af581e9e792b --- debian/copyright | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/copyright b/debian/copyright index bee9e732..0c3e3081 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,15 +2,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://www.sipwise.com/ Upstream-Contact: Sipwise Development Team -Files: hooks/pre-commit -Copyright: © 2007-2016 Joey Hess - © 2014 Pim van den Berg - © 2013 Zdenek Crha - © 2008 Scott Bronson -License: GPL-2+ +Files: + * +Copyright: + Copyright © 2007-2015 Sipwise GmbH, Austria +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 2 of the License, or + 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, @@ -22,15 +21,19 @@ License: GPL-2+ along with this program. If not, see . Comment: On Debian systems, the full text of the GNU General Public License - version 2 can be found in the file '/usr/share/common-licenses/GPL-2'. + version 3 can be found in the file '/usr/share/common-licenses/GPL-3'. -Files: * +Files: + hooks/pre-commit Copyright: - Copyright © 2007-2015, Sipwise GmbH, Austria -License: GPL-3+ + Copyright © 2007-2016 Joey Hess + Copyright © 2014 Pim van den Berg + Copyright © 2013 Zdenek Crha + Copyright © 2008 Scott Bronson +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, either version 3 of the License, or + 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, @@ -42,4 +45,4 @@ License: GPL-3+ along with this program. If not, see . Comment: On Debian systems, the full text of the GNU General Public License - version 3 can be found in the file '/usr/share/common-licenses/GPL-3'. + version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.