Update changelog, control file and copyright hints.

1 files changed, 121 insertions, 58 deletions

diff --git a/debian/copyright_hints b/debian/copyright_hints
index cc62ec74c..51ec107fe 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -8,8 +8,31 @@ Files: BUGS
  CONTRIBUTING.md
  INSTALL
  Makefile
+ data/docx/[Content_Types].xml
+ data/docx/_rels/.rels
+ data/docx/docProps/app.xml
+ data/docx/docProps/core.xml
+ data/docx/word/_rels/document.xml.rels
+ data/docx/word/_rels/footnotes.xml.rels
+ data/docx/word/document.xml
+ data/docx/word/fontTable.xml
+ data/docx/word/footnotes.xml
+ data/docx/word/numbering.xml
+ data/docx/word/settings.xml
+ data/docx/word/styles.xml
+ data/docx/word/theme/theme1.xml
+ data/docx/word/webSettings.xml
  data/dzslides/template.html
  data/epub.css
+ data/make-reference-files.hs
+ data/odt/META-INF/manifest.xml
+ data/odt/Thumbnails/thumbnail.png.metadata_dump
+ data/odt/content.xml
+ data/odt/manifest.rdf
+ data/odt/meta.xml
+ data/odt/mimetype
+ data/odt/settings.xml
+ data/odt/styles.xml
  data/reference.docx.metadata_dump
  data/sample.lua
  data/templates/default.asciidoc
@@ -71,6 +94,8 @@ Files: BUGS
  src/Text/Pandoc/Compat/TagSoupEntity.hs
  src/Text/Pandoc/Data.hsb
  src/Text/Pandoc/Readers/Docx/Reducible.hs
+ src/Text/Pandoc/Readers/Docx/StyleMap.hs
+ src/Text/Pandoc/Readers/Docx/Util.hs
  src/Text/Pandoc/Readers/EPUB.hs
  src/Text/Pandoc/Readers/OPML.hs
  tests/Tests/Arbitrary.hs
@@ -78,8 +103,8 @@ Files: BUGS
  tests/Tests/Old.hs
  tests/Tests/Readers/Docx.hs
  tests/Tests/Readers/EPUB.hs
+ tests/Tests/Readers/HTML.hs
  tests/Tests/Readers/LaTeX.hs
- tests/Tests/Readers/Org.hs
  tests/Tests/Readers/RST.hs
  tests/Tests/Readers/Txt2Tags.hs
  tests/Tests/Shared.hs
@@ -87,11 +112,13 @@ Files: BUGS
  tests/Tests/Writers/AsciiDoc.hs
  tests/Tests/Writers/ConTeXt.hs
  tests/Tests/Writers/Docbook.hs
+ tests/Tests/Writers/Docx.hs
  tests/Tests/Writers/HTML.hs
  tests/Tests/Writers/LaTeX.hs
  tests/Tests/Writers/Markdown.hs
  tests/Tests/Writers/Native.hs
  tests/Tests/Writers/Plain.hs
+ tests/Tests/Writers/RST.hs
  tests/bodybg.gif.metadata_dump
  tests/docbook-reader.docbook
  tests/docx/already_auto_ident.docx.metadata_dump
@@ -104,23 +131,33 @@ Files: BUGS
  tests/docx/definition_list.docx.metadata_dump
  tests/docx/definition_list.native
  tests/docx/drop_cap.native
+ tests/docx/german_styled_lists.docx.metadata_dump
+ tests/docx/german_styled_lists.native
  tests/docx/hanging_indent.native
  tests/docx/headers.native
  tests/docx/i18n_blocks.docx.metadata_dump
  tests/docx/i18n_blocks.native
  tests/docx/image.docx.metadata_dump
  tests/docx/image_no_embed.native
+ tests/docx/image_no_embed_writer.native
+ tests/docx/image_vml.docx.metadata_dump
+ tests/docx/image_vml.native
  tests/docx/inline_code.docx.metadata_dump
  tests/docx/inline_code.native
  tests/docx/inline_formatting.native
+ tests/docx/inline_formatting_writer.native
  tests/docx/inline_images.native
+ tests/docx/inline_images_writer.native
  tests/docx/links.native
+ tests/docx/links_writer.native
  tests/docx/lists.native
+ tests/docx/lists_writer.native
  tests/docx/metadata.native
  tests/docx/metadata_after_normal.native
  tests/docx/normalize.native
  tests/docx/notes.native
  tests/docx/numbered_header.native
+ tests/docx/table_with_list_cell.native
  tests/docx/tables.native
  tests/docx/tabs.docx.metadata_dump
  tests/docx/tabs.native
@@ -136,6 +173,8 @@ Files: BUGS
  tests/docx/trailing_spaces_in_formatting.native
  tests/docx/unicode.docx.metadata_dump
  tests/docx/unicode.native
+ tests/docx/verbatim_subsuper.docx.metadata_dump
+ tests/docx/verbatim_subsuper.native
  tests/dokuwiki_external_images.dokuwiki
  tests/dokuwiki_external_images.native
  tests/dokuwiki_inline_formatting.dokuwiki
@@ -179,6 +218,9 @@ Files: BUGS
  tests/markdown-citations.txt
  tests/markdown-reader-more.native
  tests/markdown-reader-more.txt
+ tests/media/rId25.jpg.metadata_dump
+ tests/media/rId26.jpg.metadata_dump
+ tests/media/rId27.jpg.metadata_dump
  tests/mediawiki-reader.native
  tests/mediawiki-reader.wiki
  tests/movie.jpg.metadata_dump
@@ -242,6 +284,7 @@ License: UNKNOWN
  FIXME
 
 Files: src/Text/Pandoc.hs
+ src/Text/Pandoc/Error.hs
  src/Text/Pandoc/Parsing.hs
  src/Text/Pandoc/Readers/HTML.hs
  src/Text/Pandoc/Readers/LaTeX.hs
@@ -257,8 +300,8 @@ Files: src/Text/Pandoc.hs
  src/Text/Pandoc/Writers/RST.hs
  src/Text/Pandoc/Writers/RTF.hs
  src/Text/Pandoc/XML.hs
-Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2006-2014, John MacFarlane
+Copyright: 2006-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2006-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -268,8 +311,8 @@ Files: src/Text/Pandoc/Options.hs
  src/Text/Pandoc/Slides.hs
  src/Text/Pandoc/Writers/Custom.hs
  src/Text/Pandoc/Writers/Docx.hs
-Copyright: 2012-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2012-2014, John MacFarlane
+Copyright: 2012-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2012-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -287,8 +330,8 @@ Files: src/Text/Pandoc/Highlighting.hs
  src/Text/Pandoc/Writers/DokuWiki.hs
  src/Text/Pandoc/Writers/MediaWiki.hs
  src/Text/Pandoc/Writers/ODT.hs
-Copyright: 2008-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2008-2014, John MacFarlane
+Copyright: 2008-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2008-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -296,17 +339,8 @@ Files: src/Text/Pandoc/Pretty.hs
  src/Text/Pandoc/UTF8.hs
  src/Text/Pandoc/UUID.hs
  src/Text/Pandoc/Writers/Textile.hs
-Copyright: 2010-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2010-2014, John MacFarlane
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/ImageSize.hs
- src/Text/Pandoc/MIME.hs
- src/Text/Pandoc/Readers/Native.hs
- src/Text/Pandoc/SelfContained.hs
-Copyright: 2011-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2011-2014, John MacFarlane
+Copyright: 2010-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2010-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -314,16 +348,24 @@ Files: src/Text/Pandoc/Asciify.hs
  src/Text/Pandoc/Process.hs
  src/Text/Pandoc/Writers/OPML.hs
  src/Text/Pandoc/Writers/Shared.hs
-Copyright: 2013-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2013-2014, John MacFarlane
+Copyright: 2013-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2013-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Readers/TeXMath.hs
  src/Text/Pandoc/Writers/ConTeXt.hs
  src/Text/Pandoc/Writers/Man.hs
-Copyright: 2007-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2007-2014, John MacFarlane
+Copyright: 2007-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2007-2015, John MacFarlane
+License: GPL-2+
+ FIXME
+
+Files: src/Text/Pandoc/ImageSize.hs
+ src/Text/Pandoc/MIME.hs
+ src/Text/Pandoc/SelfContained.hs
+Copyright: 2011-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2011-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -349,9 +391,16 @@ Copyright: 2014, Matthew Pickering <matthewtpickering@gmail.com>
 License: GPL-2+
  FIXME
 
+Files: src/Text/Pandoc/Readers/CommonMark.hs
+ src/Text/Pandoc/Writers/CommonMark.hs
+Copyright: 2015, John MacFarlane <jgm@berkeley.edu>
+  : 2015, John MacFarlane
+License: GPL-2+
+ FIXME
+
 Files: Setup.hs
  benchmark/benchmark-pandoc.hs
-Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
+Copyright: 2006-2015, John MacFarlane <jgm@berkeley.edu>
   2012-2014, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
@@ -368,52 +417,65 @@ Copyright: </li>
 License: UNKNOWN
  FIXME
 
+Files: tests/Tests/Readers/Markdown.hs
+ tests/Tests/Readers/Org.hs
+Copyright: du socialisme»"
+  du socialisme»")
+License: UNKNOWN
+ FIXME
+
+Files: src/Text/Pandoc/Readers/Native.hs
+Copyright: 2011-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2011-2015, John MacFarlane
+License: GPL
+ FIXME
+
 Files: pandoc.hs
-Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
-  2006-2014, John MacFarlane"
-  : 2006-2014, John MacFarlane
+Copyright: 2006-2015, John MacFarlane <jgm@berkeley.edu>
+  2006-2015, John MacFarlane"
+  : 2006-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/OpenDocument.hs
-Copyright: 2008-2014, Andrea Rossato <andrea.rossato@ing.unitn.it>
-  : 2008-2014, Andrea Rossato and John MacFarlane
+Copyright: 2008-2015, Andrea Rossato <andrea.rossato@ing.unitn.it>
+  : 2008-2015, Andrea Rossato and John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/Texinfo.hs
-Copyright: 2008-2014, John MacFarlane and Peter Wang
-  : 2008-2014, John MacFarlane and Peter Wang
+Copyright: 2008-2015, John MacFarlane and Peter Wang
+  : 2008-2015, John MacFarlane and Peter Wang
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Templates.hs
-Copyright: 2009-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2009-2014, John MacFarlane
+Copyright: 2009-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2009-2015, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/EPUB.hs
-Copyright: 2010-2014, John MacFarlane <jgm@berkeley.edu>
-  : 2010-2014, John MacFarlane
+Copyright: 2010-2015, John MacFarlane <jgm@berkeley.edu>
+  : 2010-2015, John MacFarlane
   claimant", "cpc")
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Readers/Textile.hs
-Copyright: 2010-2014, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
-  : 2010-2014, Paul Rivier and John MacFarlane
+Copyright: 2010-2015, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
+  : 2010-2015, Paul Rivier and John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/Org.hs
-Copyright: 2010-2014, Puneeth Chaganti <punchagan@gmail.com>
-  : 2010-2014, Puneeth Chaganti and John MacFarlane
+Copyright: 2010-2015, Puneeth Chaganti <punchagan@gmail.com>
+  : 2010-2015, Puneeth Chaganti and John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Readers/Org.hs
-Copyright: 2014, Albert Krewinkel <tarleb@moltkeplatz.de>
+Copyright: 2014-2015, Albert Krewinkel <tarleb@moltkeplatz.de>
   : 2014, Albert Krewinkel
 License: GPL-2+
  FIXME
@@ -459,7 +521,12 @@ License: UNKNOWN
  FIXME
 
 Files: tests/writer.opml
-Copyright: &#10;&#10;AT&amp;T has an ampersand in their name.&#10;&#10;AT&amp;T is another way to write it.&#10;&#10;This &amp; that.&#10;&#10;4 \&lt; 5.&#10;&#10;6 \&gt; 5.&#10;&#10;Backslash: \\&#10;&#10;Backtick: \`&#10;&#10;Asterisk: \*&#10;&#10;Underscore: \_&#10;&#10;Left brace: {&#10;&#10;Right brace: }&#10;&#10;Left bracket: [&#10;&#10;Right bracket:
+Copyright: &#10;&#10;AT&amp;T has an ampersand in their name.&#10;&#10;AT&amp;T is another way to write it.&#10;&#10;This &amp; that.&#10;&#10;4 &amp;lt; 5.&#10;&#10;6 &amp;gt; 5.&#10;&#10;Backslash: \\&#10;&#10;Backtick: \`&#10;&#10;Asterisk: \*&#10;&#10;Underscore: \_&#10;&#10;Left brace: {&#10;&#10;Right brace: }&#10;&#10;Left bracket: \[&#10;&#10;Right bracket: \
+License: UNKNOWN
+ FIXME
+
+Files: tests/docx/table_with_list_cell.docx.metadata_dump
+Copyright: : 2007, Apple Inc.
 License: UNKNOWN
  FIXME
 
@@ -489,7 +556,7 @@ License: UNKNOWN
  FIXME
 
 Files: README
-Copyright: 2006-2013, John MacFarlane (jgm at berkeley dot edu). Released under the
+Copyright: 2006-2015, John MacFarlane (jgm@berkeley.edu). Released under the
   2007, Joe Smith
   2007, John Smith, CC BY-NC
   for full and warranty notices.)
@@ -497,13 +564,14 @@ License: UNKNOWN
  FIXME
 
 Files: pandoc.cabal
-Copyright: 2006-2014, John MacFarlane
+Copyright: 2006-2015, John MacFarlane
 License: UNKNOWN
  FIXME
 
 Files: changelog
 Copyright: 2007, John Smith, CC BY-NC
   file
+  files for `pandoc`, `pandoc-citeproc`
   message in Main.hs
   message to '-v' output, modeled after FSF messages
   sign )
@@ -516,8 +584,8 @@ License: UNKNOWN
  FIXME
 
 Files: man/man1/pandoc.1
-Copyright: 2006\-2013, John MacFarlane (jgm at berkeley dot edu)
-  for full and warranty notices.) Other
+Copyright: 2006\-2015, John MacFarlane (jgm@berkeley.edu)
+  for full and warranty notices.)
 License: UNKNOWN
  FIXME
 
@@ -526,26 +594,21 @@ Copyright: \u169?\sa180\par}
 License: UNKNOWN
  FIXME
 
-Files: tests/Tests/Readers/Markdown.hs
-Copyright: du socialisme»"
-  du socialisme»")
-License: UNKNOWN
- FIXME
-
 Files: src/Text/Pandoc/Readers/DocBook.hs
 Copyright: - information about a document
 License: UNKNOWN
  FIXME
 
 Files: COPYRIGHT
-Copyright: 2004, Peter Jipsen http://www.chapman.edu/~jipsen
+Copyright: 1994–2015, Lua.org, PUC-Rio
+  2004, Peter Jipsen http://www.chapman.edu/~jipsen
   2005, Peter Jipsen
-  2006-2014, John MacFarlane <jgm at berkeley dot edu>
-  2008-2014, Andrea Rossato and John MacFarlane
-  2008-2014, John MacFarlane and Peter Wang
-  2010-2014, Paul Rivier and John MacFarlane
-  2010-2014, Puneeth Chaganti and JohnMacFarlane
-  2014, Albert Krewinkel
-License: WTFPL GPL-2+
+  2006-2015, John MacFarlane <jgm at berkeley dot edu>
+  2008-2015, Andrea Rossato and John MacFarlane
+  2008-2015, John MacFarlane and Peter Wang
+  2010-2015, Paul Rivier and John MacFarlane
+  2010-2015, Puneeth Chaganti and John MacFarlane
+  2014-2015, Albert Krewinkel
+License: WTFPL MIT/X11 (BSD like) GPL-2+
  FIXME