[SCM] freetuxtv/master: Updated d/copyright to correct a few issues reported by 'debmake - k'.

Thu Jun 2 05:49:16 UTC 2016

The following commit has been merged in the master branch:
commit 60ad658a96cde09654c6c8b88f21119478de986b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Jun 2 05:49:03 2016 +0000

    Updated d/copyright to correct a few issues reported by 'debmake - k'.

diff --git a/debian/changelog b/debian/changelog
index eed06ca..4346c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ freetuxtv (0.6.8~dfsg1-1) unstable; urgency=medium
     + Fix crash at startup (Closes: #819307, #772845)
   * Update package description (Closes: #813192)
 
+  [ Petter Reinholdtsen ]
+  * Updated d/copyright to correct a few issues reported by 'debmake - k'.
+
  -- Eric Beuque <ebeuque at debian>  Tue, 24 May 2016 18:49:41 +0200
 
 freetuxtv (0.6.6~dfsg1-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 9ccf0a6..25fd4aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,11 +70,11 @@ License: other
  be used in projects which are not available under a GNU Public License,
  but which still want to provide support for the GNU gettext functionality.
 
-Files: compile config.guess config.sub depcomp ltmain.sh missing
+Files: compile depcomp missing
 Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  Free Software Foundation, Inc.
-License: GPL-2+
+License: GPL-2.0+ with autoconf exception
  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
@@ -86,12 +86,68 @@ License: GPL-2+
  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
+ along with this package.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that program.
+ .
+ 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: ltmain.sh
+Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+License: GPL-2.0+ with libtool exception
+ 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 package.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License,
+ if you distribute this file as part of a program or library that
+ is built using GNU Libtool, you may include this file under the
+ same distribution terms that you use for the rest of that program.
  .
  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: config.guess config.sub
+Copyright: 1992-2014 Free Software Foundation, Inc.
+License: GPL-3.0+ with autoconf exception
+ This file 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 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/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.  This Exception is an additional permission under section 7
+ of the GNU General Public License, version 3 ("GPLv3").
+ .
+ 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: install-sh
 Copyright: 1994 X Consortium
 License:  X11

-- 
freetuxtv packaging

