[linux-tools] 07/07: debian/copyright: Move GPL-2 boilerplate to its own paragraph

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux-tools.

commit cb4117a268832a5b2df44b10c7cbd98debf82028
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Mar 20 16:22:21 2016 +0000

    debian/copyright: Move GPL-2 boilerplate to its own paragraph
    
    It is apparently valid to refer to licenses by short name alone only
    if the full text is placed in a standalone License paragraph, not as
    part of an earlier Files paragraph.
---
 debian/changelog |  1 +
 debian/copyright | 32 +++++++++++++++++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b094898..4d89242 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ linux-tools (4.4.6-1) UNRELEASED; urgency=medium
   * debian/control: Update policy version to 3.9.7; no changes required
   * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in
     64-bit packages
+  * debian/copyright: Move GPL-2 boilerplate to its own paragraph
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 20 Mar 2016 15:35:32 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 7ba027e..6016868 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,21 +11,6 @@ Comment:
 Files: *
 Copyright: 1991-2012 Linus Torvalds and many others
 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 version 2 as
- published by the Free Software Foundation.
- .
- 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- 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: 2006-2012 Debian kernel team
@@ -49,3 +34,20 @@ License: LGPL-2.1
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+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 version 2 as
+ published by the Free Software Foundation.
+ .
+ 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License version
+ 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git