Group files by License, try to better organize stanzas.

Still needs more work.

diff --git a/debian/copyright b/debian/copyright
index 9c72d2f381a833cc749cb71b002f4352d676df91..63cb69c474ff79651d68ef6c51670dfd4d478710 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,12 +19,15 @@ Copyright: © 2002, John Labenski
 License: wxWidgets
 
 Files: extra_lib/include/a52dec/*
-Copyright: © 2000-2002, Michel Lespinasse <walken@zoy.org>
-           © 1999-2000, Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
-License: GPL-2+
-
-Files: extra_lib/include/faad/*
-Copyright: © 2003-2005, M. Bakker, Nero AG
+ extra_lib/include/mad/*
+ extra_lib/include/xvid/*
+ extra_lib/include/faad/*
+Copyright:
+ 2000-2002, Michel Lespinasse <walken@zoy.org>
+ 1999-2000, Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+ 2000-2004, Underbit Technologies, Inc.
+ 2001-2004, Peter Ross <pross@xvid.org>
+ 2003-2005, M. Bakker, Nero AG
 License: GPL-2+
 
 Files: extra_lib/include/ffmpeg_android/*
@@ -48,10 +51,6 @@ Files: extra_lib/include/js/*
 Copyright: © 1998, Netscape Communications Corporation
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
-Files: extra_lib/include/mad/*
-Copyright: © 2000-2004, Underbit Technologies, Inc.
-License: GPL-2+
-
 Files: extra_lib/include/ogg/*
        extra_lib/include/theora/*
        extra_lib/include/vorbis/*
@@ -60,6 +59,17 @@ Files: extra_lib/include/ogg/*
 Copyright: © 1994-2002, Xiph.Org Foundation
 License: BSD-3-clause
 
+Files: extra_lib/include/openjpeg/*
+Copyright: © 2002-2007, Communications and Remote Sensing Laboratory,
+             Universite catholique de Louvain (UCL), Belgium
+           © 2002-2007, Professor Benoit Macq
+           © 2001-2003, David Janssens
+           © 2002-2003, Yannick Verschueren
+           © 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+           © 2005, Herve Drolon, FreeImage Team
+           © 2006-2007, Parvatha Elangovan
+License: BSD-2-clause
+
 Files: modules/widgetman/*
 Copyright: © 2009 Telecom ParisTech
 License: LGPL-2+ or other-nonfree-1
@@ -70,6 +80,21 @@ Copyright: © 2012, Alessio Treglia <alessio@debian.org>
            © 2009-2011, Reinhard Tartler <siretart@tauware.de>
 License: LGPL-2+
 
+Files: extra_lib/include/png/*
+Copyright: © 1998-2008 Glenn Randers-Pehrson
+           © 1996, 1997 Andreas Dilger
+           © 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+License: Zlib
+
+Files: extra_lib/include/openssl/*
+Copyright: © 1998-2004, The OpenSSL Project
+           © 1995-1998, Eric A. Young, Tim J. Hudson
+License: OpenSSL License
+
+Files: extra_lib/include/platinum/*
+Copyright: © 2002-2008, Axiomatic Systems, LLC.
+License: BSD-3-clause-axiomatic
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -98,15 +123,6 @@ License: BSD-3-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: extra_lib/include/openjpeg/*
-Copyright: © 2002-2007, Communications and Remote Sensing Laboratory,
-             Universite catholique de Louvain (UCL), Belgium
-           © 2002-2007, Professor Benoit Macq
-           © 2001-2003, David Janssens
-           © 2002-2003, Yannick Verschueren
-           © 2003-2007, Francois-Olivier Devaux and Antonin Descampe
-           © 2005, Herve Drolon, FreeImage Team
-           © 2006-2007, Parvatha Elangovan
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -129,14 +145,7 @@ License: BSD-2-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: extra_lib/include/openssl/*
-Copyright: © 1998-2004, The OpenSSL Project
-           © 1995-1998, Eric A. Young, Tim J. Hudson
-License: OpenSSL License
-
-Files: extra_lib/include/platinum/*
-Copyright: © 2002-2008, Axiomatic Systems, LLC.
-License: BSD-3-clause
+License: BSD-3-clause-axiomatic
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
      * Redistributions of source code must retain the above copyright
@@ -159,10 +168,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: extra_lib/include/png/*
-Copyright: © 1998-2008 Glenn Randers-Pehrson
-           © 1996, 1997 Andreas Dilger
-           © 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
 License: Zlib
  For the purposes of this copyright and license, "Contributing Authors"
  is defined as the following set of individuals:
@@ -199,10 +204,6 @@ License: Zlib
  source code in a product, acknowledgment is not required but would be
  appreciated.
 
-Files: extra_lib/include/xvid/*
-Copyright: © 2001-2004, Peter Ross <pross@xvid.org>
-License: GPL-2+
-
 Files: extra_lib/include/zlib/*
        src/utils/gzio.cpp
        src/utils/zlib_*