[SCM] flac/master: file-without-copyright-information

[onlyjob at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e90b9c42083442816b5296499e93e1ce844c9dba
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Apr 26 19:24:13 2015 +1000

    file-without-copyright-information

diff --git a/debian/copyright b/debian/copyright
index 03fcf60..a2f5194 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,10 @@ Upstream-Name: FLAC
 Upstream-Contact: https://www.xiph.org/flac/
 Source: https://git.xiph.org/?p=flac.git
 
+Files: *
+Copyright: 2011-2014, Xiph.Org Foundation
+License: GPL-2+ or LGPL-2.1+
+
 Files: doc/*
 Copyright: 2000-2009, Josh Coalson
   2011-2014, Xiph.Org Foundation
@@ -48,18 +52,6 @@ Copyright: 1994-2013, Free Software Foundation, Inc
   2003, Philip Jägenstedt
   2011-2014, Xiph.Org Foundation
 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
- * as published by the Free Software Foundation; either version 2
- * 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.
- .
- 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: include/FLAC++/*
  include/FLAC/*
@@ -130,18 +122,6 @@ Copyright: 1994-2013, Free Software Foundation, Inc
   2002-2009, Josh Coalson
   2011-2014, Xiph.Org Foundation
 License: LGPL-2.1+
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: include/share/getopt.h
  src/share/getopt/getopt.c
@@ -208,6 +188,8 @@ Copyright: 2001-2005, Matt Zimmerman <mdz at debian.org>
   2005-2007, Joshua Kwan <joshk at triplehelix.org>
   2009-2014, Fabian Greffrath <fabian+debian at greffrath.com>
 License: GPL-2+
+
+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
@@ -221,5 +203,20 @@ License: GPL-2+
  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 2 can be found in "/usr/share/common-licenses/GPL-2".
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ The complete text of the GNU Lesser General Public License
+ can be found in "/usr/share/common-licenses/LGPL-2.1".
+

-- 
flac packaging