From 8f3f2002bb42766f9ff3cb02a813d7d05bd5c5e1 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Tue, 26 Jul 2016 12:44:44 +0100
Subject: Update debian/copyright as package is mostly GPL-2 only, not GPL-2+
 (Closes: #824896)

---
 debian/changelog |  7 +++++++
 debian/copyright | 24 +++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 64f72d50..d21b756d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+btrfs-progs (4.5.2-2) UNRELEASED; urgency=high
+
+  * Update debian/copyright as package is mostly GPL-2 only, not GPL-2+
+    (Closes: #824896)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 26 Jul 2016 12:43:42 +0100
+
 btrfs-progs (4.5.2-1) unstable; urgency=medium
 
   [ Dimitri John Ledkov ]
diff --git a/debian/copyright b/debian/copyright
index 52c8462b..3412f64b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,16 +11,18 @@ Copyright: 2007-2009 Oracle <http://www.oracle.com/>
            2001 Momchil Velikov
            2001 Christoph Hellwig
            2005 SGI, Christoph Lameter <clameter@sgi.com>
-License: GPL-2+
+License: GPL-2
 
 Files: radix-tree.h
 Copyright: 2007-2009 Oracle <http://www.oracle.com/>
            2001 Momchil Velikov
            2001 Christoph Hellwig
-License: GPL-2+
+License: GPL-2
 
 Files: debian/*
-Copyright: 2007-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
+Copyright: 2007-2013 Daniel Baumann <daniel.baumann@progress-technologies.net>
+           2013 <luk@debian.org>
+	   2013-2016 Dimitri John Ledkov <xnox@debian.org>, et al.
 License: GPL-2+
 
 License: GPL-2+
@@ -39,3 +41,19 @@ License: GPL-2+
  .
  The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
+
+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 v2 as published by
+ the Free Software Foundation.
+ .
+ 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 <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
-- 
cgit v1.2.3