Update changelog, control file and copyright hints.

3 files changed, 170 insertions, 192 deletions

diff --git a/debian/changelog b/debian/changelog
index a5ecb42c4..73b6aa5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-pandoc (1.16.0.2~dfsg-2) UNRELEASED; urgency=medium
+pandoc (1.17.0.3~dfsg-1) UNRELEASED; urgency=medium
 
+  [ upstream ]
+  * New release(s).
+
+  [ Jonas Smedegaard ]
   * Update watch file:
     + Add usage comment.
     + Bump to version 4.
@@ -7,6 +11,22 @@ pandoc (1.16.0.2~dfsg-2) UNRELEASED; urgency=medium
     + Use substitution variables.
   * Drop CDBS get-orig-source target: Use "gbp import-orig --uscan"
     instead.
+  * Update copyright info:
+    + Extend coverage for upstream authors to include current year.
+    + Extend coverage of packaging to include current year.
+  * Update long descriptions to mention new writer TEI Simple.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Use https protocol in Vcs-Git URL.
+  * Modernize git-buildpackage config:
+    + Drop git- prefix.
+    + Ignore anything .git*.
+  * Unfuzz patches.
+  * Modernize copyright-check.
+  * Update package relations:
+    + Relax GHC upper bounds for zip-archive aeson.
+    + Tighten GHC lower bounds for tagsoup.
+    + Tighten to build-depend versioned on cdbs: Needed for improved
+      copyright-check.
 
  -- Jonas Smedegaard <dr@jones.dk>  Thu, 21 Apr 2016 11:22:33 +0200
 
diff --git a/debian/control b/debian/control
index eb6adfb0a..bae9dd1ed 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,13 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.or
 Uploaders: Jonas Smedegaard <dr@jones.dk>
  , Kiwamu Okabe <kiwamu@debian.or.jp>
  , Clint Adams <clint@debian.org>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.138~),
  devscripts,
+ libregexp-assemble-perl,
+ libimage-exiftool-perl,
+ libfont-ttf-perl,
  debhelper,
  dh-buildinfo,
- libimage-exiftool-perl,
- libregexp-assemble-perl,
- libipc-system-simple-perl,
- lcdf-typetools,
  ghc,
  alex,
  happy,
@@ -24,7 +23,7 @@ Build-Depends: cdbs,
  libghc-network-uri-dev (<< 2.7),
  libghc-text-dev (<< 1.3),
  libghc-zip-archive-dev (>= 0.2.3.4),
- libghc-zip-archive-dev (<< 0.3),
+ libghc-zip-archive-dev (<< 0.4),
  libghc-http-dev (<< 1:4000.4),
  libghc-texmath-dev (>= 0.8.4.1),
  libghc-texmath-dev (<< 0.9),
@@ -34,8 +33,8 @@ Build-Depends: cdbs,
  libghc-pandoc-types-dev (>= 1.16),
  libghc-pandoc-types-dev (<< 1.17),
  libghc-aeson-dev (>= 0.7.0.5),
- libghc-aeson-dev (<< 0.11),
- libghc-tagsoup-dev (>= 0.13.1),
+ libghc-aeson-dev (<< 0.12),
+ libghc-tagsoup-dev (>= 0.13.7),
  libghc-tagsoup-dev (<< 0.14),
  libghc-base64-bytestring-dev (<< 1.1),
  libghc-zlib-dev (<< 0.7),
@@ -146,9 +145,9 @@ Build-Depends-Indep: ghc-doc
   , libghc-pcre-light-doc
   , libghc-transformers-doc
   , libghc-utf8-string-doc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://pandoc.org/
-Vcs-Git: git://anonscm.debian.org/pkg-haskell/pandoc.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/pandoc.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/pandoc.git
 
 Package: pandoc
@@ -171,7 +170,7 @@ Description: general markup converter
  ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
  MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML,
+ EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -211,7 +210,7 @@ Description: general markup converter - data files
  ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
  MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML,
+ EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -250,7 +249,7 @@ Description: general markup converter - libraries
  ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
  MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML,
+ EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -285,7 +284,7 @@ Description: general markup converter - library documentation
  ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
  MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML,
+ EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
@@ -321,7 +320,7 @@ Description: general markup converter - profiling libraries
  ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
  MediaWiki, DokuWiki, Textile, groff man pages, GNU Texinfo,
  plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
- EPUB (v2 or v3), FictionBook2, InDesign ICML,
+ EPUB (v2 or v3), FictionBook2, InDesign ICML, TEI Simple,
  and several kinds of HTML/javascript slide shows
  (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
diff --git a/debian/copyright_hints b/debian/copyright_hints
index b62dab2fc..254519050 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -25,7 +25,7 @@ Files: BUGS
  data/dzslides/template.html
  data/epub.css
  data/odt/META-INF/manifest.xml
- data/odt/Thumbnails/thumbnail.png.metadata_dump
+ data/odt/Thumbnails/thumbnail.png
  data/odt/content.xml
  data/odt/manifest.rdf
  data/odt/meta.xml
@@ -40,6 +40,7 @@ Files: BUGS
  data/templates/default.docbook
  data/templates/default.dokuwiki
  data/templates/default.dzslides
+ data/templates/default.epub
  data/templates/default.epub3
  data/templates/default.haddock
  data/templates/default.html
@@ -59,6 +60,7 @@ Files: BUGS
  data/templates/default.s5
  data/templates/default.slideous
  data/templates/default.slidy
+ data/templates/default.tei
  data/templates/default.texinfo
  data/templates/default.textile
  debian/NEWS
@@ -68,14 +70,11 @@ Files: BUGS
  debian/control
  debian/control.in
  debian/gbp.conf
- debian/hsmarkdown.1
  debian/libghc-pandoc-doc.doc-base
  debian/pandoc-data.install
  debian/pandoc.README.Debian
  debian/pandoc.install
- debian/pandoc.links
  debian/pandoc.lintian-overrides
- debian/patches/020151023~317d9ee.patch
  debian/patches/1001_online_latexmathml_default.patch
  debian/patches/2001_avoid_missing_files.patch
  debian/patches/README
@@ -96,7 +95,7 @@ Files: BUGS
  src/Text/Pandoc/Compat/Time.hs
  src/Text/Pandoc/Data.hsb
  src/Text/Pandoc/Readers/DocBook.hs
- src/Text/Pandoc/Readers/Docx/Reducible.hs
+ src/Text/Pandoc/Readers/Docx/Combine.hs
  src/Text/Pandoc/Readers/Docx/StyleMap.hs
  src/Text/Pandoc/Readers/Docx/Util.hs
  src/Text/Pandoc/Readers/EPUB.hs
@@ -109,7 +108,9 @@ Files: BUGS
  tests/Tests/Readers/EPUB.hs
  tests/Tests/Readers/HTML.hs
  tests/Tests/Readers/LaTeX.hs
+ tests/Tests/Readers/Markdown.hs
  tests/Tests/Readers/Odt.hs
+ tests/Tests/Readers/Org.hs
  tests/Tests/Readers/RST.hs
  tests/Tests/Readers/Txt2Tags.hs
  tests/Tests/Shared.hs
@@ -124,36 +125,41 @@ Files: BUGS
  tests/Tests/Writers/Native.hs
  tests/Tests/Writers/Plain.hs
  tests/Tests/Writers/RST.hs
- tests/bodybg.gif.metadata_dump
+ tests/Tests/Writers/TEI.hs
+ tests/bodybg.gif
  tests/docbook-reader.docbook
  tests/docbook-xref.docbook
  tests/docbook-xref.native
- tests/docx/already_auto_ident.docx.metadata_dump
+ tests/docx/adjacent_links.docx
+ tests/docx/adjacent_links.native
+ tests/docx/already_auto_ident.docx
  tests/docx/already_auto_ident.native
  tests/docx/block_quotes_parse_indent.native
  tests/docx/char_styles.native
- tests/docx/codeblock.docx.metadata_dump
+ tests/docx/codeblock.docx
  tests/docx/codeblock.native
  tests/docx/deep_normalize.native
- tests/docx/definition_list.docx.metadata_dump
+ tests/docx/definition_list.docx
  tests/docx/definition_list.native
  tests/docx/drop_cap.native
- tests/docx/dummy_item_after_list_item.docx.metadata_dump
+ tests/docx/dummy_item_after_list_item.docx
  tests/docx/dummy_item_after_list_item.native
- tests/docx/dummy_item_after_paragraph.docx.metadata_dump
+ tests/docx/dummy_item_after_paragraph.docx
  tests/docx/dummy_item_after_paragraph.native
- tests/docx/german_styled_lists.docx.metadata_dump
+ tests/docx/enumerated_headings.docx
+ tests/docx/enumerated_headings.native
+ tests/docx/german_styled_lists.docx
  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.docx
  tests/docx/i18n_blocks.native
- tests/docx/image.docx.metadata_dump
+ tests/docx/image.docx
  tests/docx/image_no_embed.native
  tests/docx/image_no_embed_writer.native
- tests/docx/image_vml.docx.metadata_dump
+ tests/docx/image_vml.docx
  tests/docx/image_vml.native
- tests/docx/inline_code.docx.metadata_dump
+ tests/docx/inline_code.docx
  tests/docx/inline_code.native
  tests/docx/inline_formatting.native
  tests/docx/inline_formatting_writer.native
@@ -169,25 +175,25 @@ Files: BUGS
  tests/docx/normalize.native
  tests/docx/notes.native
  tests/docx/numbered_header.native
- tests/docx/special_punctuation.docx.metadata_dump
+ tests/docx/special_punctuation.docx
  tests/docx/special_punctuation.native
  tests/docx/table_with_list_cell.native
  tests/docx/tables.native
- tests/docx/tabs.docx.metadata_dump
+ tests/docx/tabs.docx
  tests/docx/tabs.native
- tests/docx/track_changes_deletion.docx.metadata_dump
+ tests/docx/track_changes_deletion.docx
  tests/docx/track_changes_deletion_accept.native
  tests/docx/track_changes_deletion_all.native
  tests/docx/track_changes_deletion_reject.native
- tests/docx/track_changes_insertion.docx.metadata_dump
+ tests/docx/track_changes_insertion.docx
  tests/docx/track_changes_insertion_accept.native
  tests/docx/track_changes_insertion_all.native
  tests/docx/track_changes_insertion_reject.native
- tests/docx/trailing_spaces_in_formatting.docx.metadata_dump
+ tests/docx/trailing_spaces_in_formatting.docx
  tests/docx/trailing_spaces_in_formatting.native
- tests/docx/unicode.docx.metadata_dump
+ tests/docx/unicode.docx
  tests/docx/unicode.native
- tests/docx/verbatim_subsuper.docx.metadata_dump
+ tests/docx/verbatim_subsuper.docx
  tests/docx/verbatim_subsuper.native
  tests/dokuwiki_external_images.dokuwiki
  tests/dokuwiki_external_images.native
@@ -195,12 +201,12 @@ Files: BUGS
  tests/dokuwiki_inline_formatting.native
  tests/dokuwiki_multiblock_table.dokuwiki
  tests/dokuwiki_multiblock_table.native
- tests/epub/features.epub.metadata_dump
+ tests/epub/features.epub
  tests/epub/features.native
- tests/epub/formatting.epub.metadata_dump
+ tests/epub/formatting.epub
  tests/epub/formatting.native
- tests/epub/img.epub.metadata_dump
- tests/epub/wasteland.epub.metadata_dump
+ tests/epub/img.epub
+ tests/epub/wasteland.epub
  tests/epub/wasteland.native
  tests/fb2/basic.fb2
  tests/fb2/basic.markdown
@@ -215,7 +221,7 @@ Files: BUGS
  tests/haddock-reader.haddock
  tests/haddock-reader.native
  tests/insert
- tests/lalune.jpg.metadata_dump
+ tests/lalune.jpg
  tests/latex-reader.latex
  tests/lhs-test-markdown.native
  tests/lhs-test.fragment.html+lhs
@@ -232,12 +238,12 @@ 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/media/rId25.jpg
+ tests/media/rId26.jpg
+ tests/media/rId27.jpg
  tests/mediawiki-reader.native
  tests/mediawiki-reader.wiki
- tests/movie.jpg.metadata_dump
+ tests/movie.jpg
  tests/odt/markdown/bold.md
  tests/odt/markdown/citation.md
  tests/odt/markdown/endnote.md
@@ -264,41 +270,41 @@ Files: BUGS
  tests/odt/native/simpleTable.native
  tests/odt/native/unicode.native
  tests/odt/native/unorderedList.native
- tests/odt/odt/blockquote.odt.metadata_dump
- tests/odt/odt/bold.odt.metadata_dump
- tests/odt/odt/citation.odt.metadata_dump
- tests/odt/odt/endnote.odt.metadata_dump
- tests/odt/odt/expression.odt.metadata_dump
- tests/odt/odt/expressionUnevaluated.odt.metadata_dump
- tests/odt/odt/externalLink.odt.metadata_dump
- tests/odt/odt/footnote.odt.metadata_dump
- tests/odt/odt/formula.odt.metadata_dump
- tests/odt/odt/headers.odt.metadata_dump
- tests/odt/odt/hiddenTextByStyle.odt.metadata_dump
- tests/odt/odt/hiddenTextByVariable.odt.metadata_dump
- tests/odt/odt/horizontalRule.odt.metadata_dump
- tests/odt/odt/image.odt.metadata_dump
- tests/odt/odt/imageIndex.odt.metadata_dump
- tests/odt/odt/imageWithCaption.odt.metadata_dump
- tests/odt/odt/italic.odt.metadata_dump
- tests/odt/odt/listBlocks.odt.metadata_dump
- tests/odt/odt/orderedListMixed.odt.metadata_dump
- tests/odt/odt/orderedListRoman.odt.metadata_dump
- tests/odt/odt/orderedListSimple.odt.metadata_dump
- tests/odt/odt/paragraph.odt.metadata_dump
- tests/odt/odt/referenceAllInOne.odt.metadata_dump
- tests/odt/odt/referenceToChapter.odt.metadata_dump
- tests/odt/odt/referenceToListItem.odt.metadata_dump
- tests/odt/odt/referenceToText.odt.metadata_dump
- tests/odt/odt/simpleTable.odt.metadata_dump
- tests/odt/odt/strikeout.odt.metadata_dump
- tests/odt/odt/table.odt.metadata_dump
- tests/odt/odt/tableWithCaption.odt.metadata_dump
- tests/odt/odt/trackedChanges.odt.metadata_dump
- tests/odt/odt/underlined.odt.metadata_dump
- tests/odt/odt/unicode.odt.metadata_dump
- tests/odt/odt/unorderedList.odt.metadata_dump
- tests/odt/odt/variable.odt.metadata_dump
+ tests/odt/odt/blockquote.odt
+ tests/odt/odt/bold.odt
+ tests/odt/odt/citation.odt
+ tests/odt/odt/endnote.odt
+ tests/odt/odt/expression.odt
+ tests/odt/odt/expressionUnevaluated.odt
+ tests/odt/odt/externalLink.odt
+ tests/odt/odt/footnote.odt
+ tests/odt/odt/formula.odt
+ tests/odt/odt/headers.odt
+ tests/odt/odt/hiddenTextByStyle.odt
+ tests/odt/odt/hiddenTextByVariable.odt
+ tests/odt/odt/horizontalRule.odt
+ tests/odt/odt/image.odt
+ tests/odt/odt/imageIndex.odt
+ tests/odt/odt/imageWithCaption.odt
+ tests/odt/odt/italic.odt
+ tests/odt/odt/listBlocks.odt
+ tests/odt/odt/orderedListMixed.odt
+ tests/odt/odt/orderedListRoman.odt
+ tests/odt/odt/orderedListSimple.odt
+ tests/odt/odt/paragraph.odt
+ tests/odt/odt/referenceAllInOne.odt
+ tests/odt/odt/referenceToChapter.odt
+ tests/odt/odt/referenceToListItem.odt
+ tests/odt/odt/referenceToText.odt
+ tests/odt/odt/simpleTable.odt
+ tests/odt/odt/strikeout.odt
+ tests/odt/odt/table.odt
+ tests/odt/odt/tableWithCaption.odt
+ tests/odt/odt/trackedChanges.odt
+ tests/odt/odt/underlined.odt
+ tests/odt/odt/unicode.odt
+ tests/odt/odt/unorderedList.odt
+ tests/odt/odt/variable.odt
  tests/opml-reader.native
  tests/opml-reader.opml
  tests/pipe-tables.native
@@ -327,6 +333,7 @@ Files: BUGS
  tests/tables.plain
  tests/tables.rst
  tests/tables.rtf
+ tests/tables.tei
  tests/tables.texinfo
  tests/tables.textile
  tests/tables.txt
@@ -380,12 +387,32 @@ Files: Setup.hs
  src/Text/Pandoc/Pretty.hs
  src/Text/Pandoc/Process.hs
  src/Text/Pandoc/Readers/CommonMark.hs
+ src/Text/Pandoc/Readers/Docx.hs
+ src/Text/Pandoc/Readers/Docx/Fonts.hs
+ src/Text/Pandoc/Readers/Docx/Lists.hs
+ src/Text/Pandoc/Readers/Docx/Parse.hs
  src/Text/Pandoc/Readers/HTML.hs
  src/Text/Pandoc/Readers/LaTeX.hs
  src/Text/Pandoc/Readers/Markdown.hs
  src/Text/Pandoc/Readers/MediaWiki.hs
+ src/Text/Pandoc/Readers/Odt.hs
+ src/Text/Pandoc/Readers/Odt/Arrows/State.hs
+ src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs
+ src/Text/Pandoc/Readers/Odt/Base.hs
+ src/Text/Pandoc/Readers/Odt/ContentReader.hs
+ src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs
+ src/Text/Pandoc/Readers/Odt/Generic/Namespaces.hs
+ src/Text/Pandoc/Readers/Odt/Generic/SetMap.hs
+ src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
+ src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
+ src/Text/Pandoc/Readers/Odt/Namespaces.hs
+ src/Text/Pandoc/Readers/Odt/StyleReader.hs
+ src/Text/Pandoc/Readers/Org.hs
  src/Text/Pandoc/Readers/RST.hs
+ src/Text/Pandoc/Readers/TWiki.hs
  src/Text/Pandoc/Readers/TeXMath.hs
+ src/Text/Pandoc/Readers/Textile.hs
+ src/Text/Pandoc/Readers/Txt2Tags.hs
  src/Text/Pandoc/SelfContained.hs
  src/Text/Pandoc/Shared.hs
  src/Text/Pandoc/Slides.hs
@@ -400,6 +427,7 @@ Files: Setup.hs
  src/Text/Pandoc/Writers/Docx.hs
  src/Text/Pandoc/Writers/DokuWiki.hs
  src/Text/Pandoc/Writers/EPUB.hs
+ src/Text/Pandoc/Writers/FB2.hs
  src/Text/Pandoc/Writers/HTML.hs
  src/Text/Pandoc/Writers/Haddock.hs
  src/Text/Pandoc/Writers/LaTeX.hs
@@ -409,38 +437,41 @@ Files: Setup.hs
  src/Text/Pandoc/Writers/Native.hs
  src/Text/Pandoc/Writers/ODT.hs
  src/Text/Pandoc/Writers/OPML.hs
+ src/Text/Pandoc/Writers/OpenDocument.hs
+ src/Text/Pandoc/Writers/Org.hs
  src/Text/Pandoc/Writers/RST.hs
  src/Text/Pandoc/Writers/RTF.hs
  src/Text/Pandoc/Writers/Shared.hs
+ src/Text/Pandoc/Writers/TEI.hs
+ src/Text/Pandoc/Writers/Texinfo.hs
  src/Text/Pandoc/Writers/Textile.hs
  src/Text/Pandoc/XML.hs
 Copyright: 2006-2015, John MacFarlane <jgm@berkeley.edu>
+  2006-2016, John MacFarlane <jgm@berkeley.edu>
   2007-2015, John MacFarlane <jgm@berkeley.edu>
+  2008-2015, Andrea Rossato <andrea.rossato@ing.unitn.it>
   2008-2015, John MacFarlane <jgm@berkeley.edu>
-  2009-2015, John MacFarlane <jgm@berkeley.edu>
+  2008-2015, John MacFarlane and Peter Wang
+  2008-2016, John MacFarlane <jgm@berkeley.edu>
+  2009-2016, John MacFarlane <jgm@berkeley.edu>
   2010-2015, John MacFarlane <jgm@berkeley.edu>
-  2011-2015, John MacFarlane <jgm@berkeley.edu>
+  2010-2015, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
+  2010-2015, Puneeth Chaganti <punchagan@gmail.com>
+  2010-2016, John MacFarlane <jgm@berkeley.edu>
+  2011-2012, Sergey Astanin
+  2011-2016, John MacFarlane <jgm@berkeley.edu>
   2012-2014, John MacFarlane <jgm@berkeley.edu>
   2012-2015, John MacFarlane <jgm@berkeley.edu>
+  2012-2016, John MacFarlane <jgm@berkeley.edu>
   2013-2015, John MacFarlane <jgm@berkeley.edu>
+  2013-2016, John MacFarlane <jgm@berkeley.edu>
+  2014, Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
+  2014, Jesse Rosenthal <jrosenthal@jhu.edu>
   2014, John MacFarlane <jgm@berkeley.edu>
+  2014, Matthew Pickering <matthewtpickering@gmail.com>
+  2014-2016, Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
   2015, John MacFarlane <jgm@berkeley.edu>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Readers/Odt.hs
- src/Text/Pandoc/Readers/Odt/Arrows/State.hs
- src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs
- src/Text/Pandoc/Readers/Odt/Base.hs
- src/Text/Pandoc/Readers/Odt/ContentReader.hs
- src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs
- src/Text/Pandoc/Readers/Odt/Generic/Namespaces.hs
- src/Text/Pandoc/Readers/Odt/Generic/SetMap.hs
- src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
- src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
- src/Text/Pandoc/Readers/Odt/Namespaces.hs
- src/Text/Pandoc/Readers/Odt/StyleReader.hs
-Copyright: 2015, Martin Linnemann <theCodingMarlin@googlemail.com>
+  2015, Martin Linnemann <theCodingMarlin@googlemail.com>
 License: GPL-2+
  FIXME
 
@@ -454,97 +485,35 @@ Copyright: ",Space,Str "169"
 License: UNKNOWN
  FIXME
 
-Files: src/Text/Pandoc/Readers/Docx.hs
- src/Text/Pandoc/Readers/Docx/Lists.hs
- src/Text/Pandoc/Readers/Docx/Parse.hs
-Copyright: 2014, Jesse Rosenthal <jrosenthal@jhu.edu>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Readers/Docx/Fonts.hs
- src/Text/Pandoc/Readers/Txt2Tags.hs
-Copyright: 2014, Matthew Pickering <matthewtpickering@gmail.com>
-License: GPL-2+
- FIXME
-
-Files: tests/fb2/test-small.png.metadata_dump
- tests/fb2/test.jpg.metadata_dump
-Copyright: 
-License: UNKNOWN
- FIXME
-
-Files: tests/html-reader.html
- tests/writer.html
-Copyright: </li>
-License: UNKNOWN
- FIXME
-
-Files: tests/Tests/Readers/Markdown.hs
- tests/Tests/Readers/Org.hs
-Copyright: du socialisme»"
-  du socialisme»")
+Files: pandoc.cabal
+ tests/fb2/test-small.png
+ tests/fb2/test.jpg
+ tests/textile-reader.textile
+ tests/writer.tei
+Copyright: 2006-2016, John MacFarlane
+  2008, h1. Footnotes
 License: UNKNOWN
  FIXME
 
 Files: README
-Copyright: 2007, Joe Smith
-License: GPL
- FIXME
-
-Files: man/pandoc.1
+ man/pandoc.1
+ src/Text/Pandoc/Readers/Native.hs
 Copyright: 2006-2015, John MacFarlane (jgm@berkeley.edu)
+  2007, Joe Smith
+  2011-2015, John MacFarlane <jgm@berkeley.edu>
 License: GPL
  FIXME
 
-Files: src/Text/Pandoc/Readers/Native.hs
-Copyright: 2011-2015, John MacFarlane <jgm@berkeley.edu>
-License: GPL
- FIXME
-
-Files: src/Text/Pandoc/Readers/Org.hs
-Copyright: 2014-2015, Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Readers/TWiki.hs
-Copyright: 2014, Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Writers/OpenDocument.hs
-Copyright: 2008-2015, Andrea Rossato <andrea.rossato@ing.unitn.it>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Writers/Texinfo.hs
-Copyright: 2008-2015, John MacFarlane and Peter Wang
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Readers/Textile.hs
-Copyright: 2010-2015, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Writers/Org.hs
-Copyright: 2010-2015, Puneeth Chaganti <punchagan@gmail.com>
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Writers/FB2.hs
-Copyright: 2011-2012, Sergey Astanin
-License: GPL-2+
+Files: tests/html-reader.html
+ tests/writer.html
+Copyright: </li>
+License: UNKNOWN
  FIXME
 
 Files: debian/rules
 Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
-  2007-2008, Recai Oktaş <roktas@debian.org>
-  2008-2015, Jonas Smedegaard <dr@jones.dk>
-License: GPL-3+
- FIXME
-
-Files: debian/print-metadata.pl
-Copyright: 2014, Jonas Smedegaard <dr@jones.dk>
+  2007-2008, Recai Oktaş <roktas@debian.org>
+  2008-2016, Jonas Smedegaard <dr@jones.dk>
 License: GPL-3+
  FIXME
 
@@ -574,23 +543,13 @@ Copyright: </text:p>
 License: UNKNOWN
  FIXME
 
-Files: pandoc.cabal
-Copyright: 2006-2015, John MacFarlane
-License: UNKNOWN
- FIXME
-
 Files: data/MathMLinHTML.js
 Copyright: Peter Jipsen http:www.chapman.edu/~jipsen
 License: UNKNOWN
  FIXME
 
 Files: changelog
-Copyright: files for `pandoc`, `pandoc-citeproc`
-License: UNKNOWN
- FIXME
-
-Files: tests/textile-reader.textile
-Copyright: 2008, h1. Footnotes
+Copyright: dates
 License: UNKNOWN
  FIXME
 
@@ -600,7 +559,7 @@ License: UNKNOWN
  FIXME
 
 Files: COPYRIGHT
-Copyright: 2006-2015, John MacFarlane <jgm at berkeley dot edu>
+Copyright: 2006-2016, John MacFarlane <jgm at berkeley dot edu>
 License: WTFPL MIT/X11 (BSD like) GPL-2+
  FIXME