Add license information about the module "widgetman", which is now dual-licensed.

Plus, sort and update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 57eb17f2bebfd7e3f0957fa496e69c41bb6bf3e7..9c72d2f381a833cc749cb71b002f4352d676df91 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=204
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gpac
 Upstream-Contact: jeanlf@users.sourceforge.net
-Source: http://gpac.sourceforge.net
+Source: http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac
 
 Files: *
 Copyright: © 2000-2005, Jean Le Feuvre
@@ -52,18 +52,24 @@ Files: extra_lib/include/mad/*
 Copyright: © 2000-2004, Underbit Technologies, Inc.
 License: GPL-2+
 
-Files: debian/*
-Copyright: © 2012, Alessio Treglia <alessio@debian.org>
-           © 2009-2011, Andres Mejia <amejia@debian.org>
-           © 2009-2011, Reinhard Tartler <siretart@tauware.de>
-License: LGPL-2+
-
 Files: extra_lib/include/ogg/*
        extra_lib/include/theora/*
        extra_lib/include/vorbis/*
        include/gpac/internal/ogg.h
        src/media_tools/gpac_ogg.c
 Copyright: © 1994-2002, Xiph.Org Foundation
+License: BSD-3-clause
+
+Files: modules/widgetman/*
+Copyright: © 2009 Telecom ParisTech
+License: LGPL-2+ or other-nonfree-1
+
+Files: debian/*
+Copyright: © 2012, Alessio Treglia <alessio@debian.org>
+           © 2009-2011, Andres Mejia <amejia@debian.org>
+           © 2009-2011, Reinhard Tartler <siretart@tauware.de>
+License: LGPL-2+
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -1392,3 +1398,26 @@ License: wxWidgets
  whether to permit this exception to apply to your modifications. If you do not
  wish that, you must delete the exception notice from such code and/or adjust
  the licensing conditions notice accordingly.
+
+License: other-nonfree-1
+ This software module was originally developed by TelecomParisTech in the
+ course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+ .
+ This software module is an implementation of a part of one or
+ more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+ (ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+ (ISO/IEC 23007-1) free license to this software module or modifications
+ thereof for use in hardware or software products claiming conformance to
+ the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+ module in hardware or software products are advised that its use may
+ infringe existing patents.
+ The original developer of this software module and his/her company, the
+ subsequent editors and their companies, and ISO/IEC have no liability
+ for use of this software module or modifications thereof in an implementation.
+ Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
+ products.
+ Telecom ParisTech retains full right to use the code for his/her own purpose,
+ assign or donate the code to a third party and to inhibit third parties from
+ using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
+ .
+ This copyright notice must be included in all copies or derivative works.