[SCM] gmerlin-encoders/master: Update debian/copyright, group files by license.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 832166568a28d791fd97a43a1aed5903d11f8445
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 19:42:59 2012 +0200

    Update debian/copyright, group files by license.

diff --git a/debian/copyright b/debian/copyright
index aaacaef..7634f0a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,15 +4,14 @@ Upstream-Contact: Members of the Gmerlin project <gmerlin-general at lists.sourcefo
 Source: http://sourceforge.net/projects/gmerlin/files/gmerlin-encoders/
 Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 
-Files: * m4/check_funcs.m4
-Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-License: GPL-3+
-
-Files: m4/avcodec.m4 m4/avformat.m4 m4/lqt_opt_cflags.m4
-Copyright: 2004-2005, Burkhard Plaum
+Files: *
+Copyright:
+ 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+ 2004-2005, Burkhard Plaum
 License: GPL-3+
 
-Files: include/*.h
+Files:
+ include/*.h
  lib/*.c
  plugins/*/*.[ch]
 Copyright: 2001-2011, Members of the Gmerlin project
@@ -28,42 +27,44 @@ Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 License: other-GAP-gettext
 
 Files: debian/*
-Copyright: 2011-2012, IOhannes m zmölnig <zmoelnig at iem.at>
- 2011 Alessio Treglia <alessio at debian.org>
+Copyright:
+ 2011-2012, IOhannes m zmölnig <zmoelnig at iem.at>
+ 2011-2012 Alessio Treglia <alessio at debian.org>
 License: GPL-2+
 
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
+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 2 of the License, or
+ 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.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
  .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-Comment: On Debian systems, the complete text of the GNU General Public
- License version 2 can be found in "/usr/share/common-licenses/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/>.
 
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
+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 3 of the License, or
+ 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.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/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/>.
-Comment: On Debian systems, the complete text of the GNU General Public
-  License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
 License: other-GAP
  This file is free software; the Free Software Foundation gives

-- 
gmerlin-encoders packaging