[SCM] gavl/master: Group files by license, sort and use short-indent style.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit aeb1c67f85dccbe2db73b7199d4543df8cab3fd2
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 12:01:32 2012 +0200

    Group files by license, sort and use short-indent style.

diff --git a/debian/copyright b/debian/copyright
index 6e36da2..a99c4c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,67 +6,26 @@ Source: http://sourceforge.net/projects/gmerlin/files/gavl/
 Files: *
 Copyright:
  2001-2011 Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-License: GPL-2+
-
-Files: gavl/memcpy.c
-Copyright: 2001-2004 the xine project
-           2001 - 2011 Members of the Gmerlin project]
-License: GPL-2+
-
-Files: gavl/mmx/mmx.h
-Copyright: 2000-2001 Michel Lespinasse <walken at zoy.org>
-           1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-License: GPL-2+
-
-Files: gavl/libgdither/*
-Copyright: 2002 Steve Harris <steve at plugin.org.uk>
-License: GPL-2+
-
-Files: gavl/libsamplerate/*
-Copyright: 2001-2008 Erik de Castro Lopo <erikd at mega-nerd.com>
-License: GPL-2+
-
-Files: include/float_cast.h
-Copyright: 2001-2002 Erik de Castro Lopo <erikd at zip.com.au>
-License: GPL-2+
-
-Files: include/arith128.h ./gavl/arith128.c
-Copyright: 2001-2011 Members of the Gmerlin project
-           2004 Linas Vepstas <linas at linas.org>
-License: GPL-2+
-
-Files: include/samplerate.h
-Copyright: 2002-2004 Erik de Castro Lopo <erikd at mega-nerd.com>
-License: GPL-2+
-
-Files: include/attributes.h
-Copyright: 2000-2001 Michel Lespinasse <walken at zoy.org>
-           1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+ 2001-2004 the xine project
+ 2004 Linas Vepstas <linas at linas.org>
+ 2001-2008 Erik de Castro Lopo <erikd at mega-nerd.com>
+ 2002 Steve Harris <steve at plugin.org.uk>
+ 2001-2002 Erik de Castro Lopo <erikd at zip.com.au>
+ 2000-2001 Michel Lespinasse <walken at zoy.org>
+ 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+ 2000-2001 Michel Lespinasse <walken at zoy.org>
+ 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
 License: GPL-2+
 
 Files: include/bswap.h
 Copyright: 2006 Michael Niedermayer <michaelni at gmx.at>
 License: LGPL-2.1+
- FFmpeg 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.
- .
- FFmpeg 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.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with FFmpeg; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-X-Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in /usr/share/common-licenses/LGPL-2.1 file.
 
 Files: debian/*
-Copyright: 2010-2012 Alessio Treglia <alessio at debian.org>
-           2008-2009 Romain Beauxis <toots at rastageeks.org>
-           2008 Christian Marillat <marillat at debian.org>
+Copyright:
+ 2010-2012 Alessio Treglia <alessio at debian.org>
+ 2008-2009 Romain Beauxis <toots at rastageeks.org>
+ 2008 Christian Marillat <marillat at debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -80,9 +39,25 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 Comment:
- 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.
- .
  On Debian systems, the complete text of the GNU General Public
  License can be found in /usr/share/common-licenses/GPL-2 file.
+ .
+ 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: LGPL-2.1+
+ FFmpeg 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.
+ .
+ FFmpeg 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.
+Comment:
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.1 file.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
gavl packaging