update debian/copyright and clarify license

This commit is contained in:
Jonathan Dowland 2016-01-26 14:30:31 +00:00
parent 6053fa3a75
commit 0ccd92c36d
2 changed files with 33 additions and 15 deletions

4
debian/changelog vendored
View File

@ -12,8 +12,10 @@ smartmontools (6.4+svn4109-2) UNRELEASED; urgency=medium
[ Jonathan Dowland ]
* Portability improvements, thanks Robert Millan. Closes: #634506.
* Update debian/copyright to Format 1.0., resolve GPL-2/GPL-2+
ambiguity. Closes: #777583.
-- Jonathan Dowland <jmtd@debian.org> Mon, 25 Jan 2016 11:24:38 +0000
-- Jonathan Dowland <jmtd@debian.org> Tue, 26 Jan 2016 14:28:54 +0000
smartmontools (6.4+svn4109-1) unstable; urgency=medium

44
debian/copyright vendored
View File

@ -1,18 +1,34 @@
This package was debianized by Guido Guenther <agx@debian.org> on
Tue, 14 Jan 2003 12:58:00 +0000.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: smartmontools
Source: http://smartmontools.sourceforge.net/
It was downloaded from http://smartmontools.sourceforge.net/
Files: *
Copyright: Copyright (C) 2002-8 Bruce Allen
Copyright (C) 2004-15 Christian Franke
License: GPL-2+
Upstream Authors:
Files: debian/*
Copyright: 2003-2009 Guido Guenther <agx@debian.org>
2009-2015 Giuseppe Iuculano <giuseppe@iuculano.it>
2010 Florian Weimer <fweimer@bfk.de>
2014 Eric Dorland <eric@debian.org>
2015 Tobias Frost <tobi@coldtobi.de>
2015-2016 Jonathan Dowland <jmtd@debian.org>
License: GPL-2
Bruce Allen <smartmontools-support@lists.sourceforge.net>
License: GPL-2+
This package 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.
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Copyright:
Copyright (C) 2002-8 Bruce Allen
License:
You are free to distribute this software under the terms of the GNU General
Public License Version 2. The full text of this license can be found in the
file /usr/share/common-licenses/GPL-2
License: GPL-2
This package 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.
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".