[SCM] freetuxtv/master: Updated d/copyright to only list GPL-3 text block once.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8a350b6f17dad7fbdf5d3d3f37a9fb2ff25df943
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Jun 2 09:33:48 2016 +0000

    Updated d/copyright to only list GPL-3 text block once.

diff --git a/debian/changelog b/debian/changelog
index 33d05de..e536c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-freetuxtv (0.6.8~dfsg1-1) unstable; urgency=medium
+freetuxtv (0.6.8-1) unstable; urgency=medium
 
   [Eric Beuque]
   * Upgrade to upstream 0.6.8
@@ -8,6 +8,7 @@ freetuxtv (0.6.8~dfsg1-1) unstable; urgency=medium
 
   [ Petter Reinholdtsen ]
   * Updated d/copyright to correct a few issues reported by 'debmake - k'.
+  * Updated d/copyright to only list GPL-3 text block once.
   * Added 02_gtkv2_port.diff to get source building with Gtk v2 in Debian
     Stable.
   * Updated Standards-Version from 3.9.5 to 3.9.8.
diff --git a/debian/copyright b/debian/copyright
index 25fd4aa..5ba43d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,21 +5,6 @@ Source: https://github.com/freetuxtv/freetuxtv
 Files: *
 Copyright: 2012, 2013, 2014, 2015, 2016 Eric Beuque <eric.beuque at gmail.com>
 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 3 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 <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: */Makefile.in aclocal.m4 configure
 Copyright: 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46,21 +31,6 @@ Copyright:
  2011	Dean Lee <xslidian at gmail.com>
  2011	Wei-Lun Chao <william.chao at ossii.com.tw>
 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 3 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 <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: po/Makefile.in.in
 Copyright: 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -177,6 +147,8 @@ Files: debian/*
 Copyright: 2012, 2013, 2014 Eric Beuque <eric.beuque at gmail.com>
            2012, 2014 Ryan Kavanagh <rak at debian.org>
 License: GPL-3+
+
+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 3 of the License, or
@@ -191,4 +163,4 @@ License: GPL-3+
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
\ No newline at end of file
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.

-- 
freetuxtv packaging