Copyright for fsmark source package in Xenial

Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fsmark
Source: http://downloads.sourceforge.net/project/fsmark/fsmark/3.3/fs_mark-3.3.tar.gz

Files: *
Copyright: 2003-2004 EMC Corporation
           2003-2004 Ric Wheeler 
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.
 .
 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 
 .
 On Debian systems, the complete text of the GNU General
 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Files: debian/*
Copyright: 2012 Martin Steigerwald 
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.
 .
 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 
 .
 On Debian systems, the complete text of the GNU General
 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Files: lib_timing.c
Copyright: 2000 Carl Staelin
           1994-1998 Larry McVoy
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.
 .
 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 
 .
 On Debian systems, the complete text of the GNU General
 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Comment:
 Carl Staelin and Larry McVoy kindly changed the license from GPL without
 version with additional restrictions to GPL version 2 or later without
 additional restrictions (see debian/patches/lib_timing.c-copyright and
 the ITP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655224#32):
 .
 ------- Forwarded message -------
 .
 Subject: Re: Fwd: Re: ITP fsmark - bug 655224: License restriction for 
 lib_timing.c DFSG compliant?
 Date: Wednesday, 11. January 2012, 11:59:10
 From: Carl Staelin <…@google.com>
 To:   Martin Steigerwald 
 Cc:   Larry McVoy <…@bitmover.com>, Ric Wheeler <…@redhat.com>
 .
 For the bits of lmbench that were used by fsmark - namely lib_timing.c -, we
 are happy to give it a GPL 2 (or later) license without any additional
 restrictions.
 .
 Cheers,
 .
 Carl