debian/copyright: update

diff --git a/debian/copyright b/debian/copyright
index 0000707fa5c162011a1e84e349e00ca5b125cfc4..8da5b9cbfb777fcc0941cdebda4caca5f3cbbbb1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,19 +5,13 @@ Source: http://code.google.com/p/flightcrew/
 
 Files: debian/*
 Copyright: 2013 Don Armstrong <don@debian.org>
+           2014 Mattia Rizzolo <mattia@mapreri.org>
 License: GPL-3+
 
-
 Files: src/*
 Copyright: 2010, Strahinja Markovic
 License: LGPL-3+
 
-Files:
- src/FlightCrew/Schemas/ncx-2005-1.dtd
-Copyright: *No copyright*
-License: UNKNOWN
- FIXME
-
 Files: src/zipios/*
 Copyright: 2000, Thomas Søndergaard
 License: LGPL-2+
@@ -28,6 +22,61 @@ Files:
  src/utf8-cpp/utf8/core.h
  src/utf8-cpp/utf8/unchecked.h
 Copyright: 2006, Nemanja Trifunovic
+License: EXPAT
+
+Files: src/FlightCrew/Misc/CustomAssert.cpp
+ src/FlightCrew/Misc/CustomAssert.h
+Copyright: 2008, Power of Two Games LLC
+License: BSD-3-clause
+
+Files: src/FlightCrew/Misc/XercesHUse.h
+Copyright: 2009-2010, Strahinja Markovic
+License: GPL-3+
+
+Files: src/zipios/zipios++/zipios-config.w32.h
+Copyright: 2000, 1. Thomas Søndergaard 2. Kevin Shea
+License: LGPL-2+
+
+Files: src/FlightCrew/tests/misc_tests/NormalizePath_test.cpp
+Copyright: 2011, John Schember
+License: LGPL-3+
+
+Files: src/FlightCrew/Schemas/xhtml11-flat.dtd
+Copyright: 1998-2000, World Wide Web Consortium
+License: XHTML-DTD
+
+Files: src/FlightCrew/Schemas/ncx-2005-1.dtd
+Copyright: 2002-2005 The DAISY Consortium
+Comment: Stated by the Secretary of DAISY:
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=73;bug=602781
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=83;bug=602781
+ Below a quote from these emails.
+License: Permissive
+ The DTDs  are freely available from DAISY website; start at:
+ http://www.daisy.org/z3986 There is no cost associated with the use of these
+ DTDs.
+ .
+ Many companies will copy and distribute these DTDs for use with their
+ authoring or playback tools, which is perfectly fine. This may eliminate the
+ need to go online for validation, etc.
+ The working group may update the DTDs if errors are found and this will be
+ announced publically.
+ The DTDs were developed and highly influenced by HTML and Docbook.
+ .
+ The DTDs may be modified for your use, but you may not claim that a modified
+ version conforms to the DAISY Standard or the Niso Z39.86 Standard. It is
+ common for XML and DTD developers to borrow from various standards, and this
+ is expected.
+ .
+ You may want to look at the ANSI/NISO Z39.98 specification for a more
+ up-to-date mechanism for content creation that conforms to XML.
+ .
+ If you create your own DTDs and you have borrowed, even heavily from these,
+ yes, you would be able to distribute the DTDs. I think 67 of the elements from
+ dtbook dtds came from HTML.
+ .
+ However, one should not claim that modified versions conform to DAISY or NISO.
+
 License: EXPAT
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
@@ -51,9 +100,6 @@ License: EXPAT
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-Files: src/FlightCrew/Misc/CustomAssert.cpp
- src/FlightCrew/Misc/CustomAssert.h
-Copyright: 2008, Power of Two Games LLC
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -77,22 +123,7 @@ 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: src/FlightCrew/Misc/XercesHUse.h
-Copyright: 2009-2010, Strahinja Markovic
-License: GPL-3+
-
-Files: src/zipios/zipios++/zipios-config.w32.h
-Copyright: 2000, 1. Thomas Søndergaard 2. Kevin Shea
-License: LGPL-2+
-
-Files: src/FlightCrew/tests/misc_tests/NormalizePath_test.cpp
-Copyright: 2011, John Schember
-License: LGPL-3+
-
-Files: src/FlightCrew/Schemas/xhtml11-flat.dtd
-Copyright: 1998-2000, World Wide Web Consortium
-  holders make no
-License: XHTML DTD
+License: XHTML-DTD
  Permission to use, copy, modify and distribute the XHTML DTD and its
  accompanying documentation for any purpose and without fee is hereby
  granted in perpetuity, provided that the above copyright notice and