Update changelog, control file and copyright hints.

1 files changed, 71 insertions, 63 deletions

diff --git a/debian/copyright_hints b/debian/copyright_hints
index e100c1e30..54b611434 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,8 +7,6 @@ Disclaimer: Autogenerated by CDBS
 Files: BUGS
  CONTRIBUTING.md
  INSTALL
- Setup.hs
- benchmark/benchmark-pandoc.hs
  data/dzslides/template.html
  data/epub.css
  data/reference.docx
@@ -22,6 +20,7 @@ Files: BUGS
  data/templates/default.epub3
  data/templates/default.html
  data/templates/default.html5
+ data/templates/default.icml
  data/templates/default.latex
  data/templates/default.man
  data/templates/default.markdown
@@ -55,7 +54,6 @@ Files: BUGS
  debian/patches/2001_avoid_missing_files.patch
  debian/patches/README
  debian/patches/series
- debian/rules
  debian/source/format
  debian/watch
  man/make-pandoc-man-pages.hs
@@ -71,9 +69,11 @@ Files: BUGS
  tests/Tests/Helpers.hs
  tests/Tests/Old.hs
  tests/Tests/Readers/LaTeX.hs
+ tests/Tests/Readers/Org.hs
  tests/Tests/Readers/RST.hs
  tests/Tests/Shared.hs
  tests/Tests/Walk.hs
+ tests/Tests/Writers/AsciiDoc.hs
  tests/Tests/Writers/ConTeXt.hs
  tests/Tests/Writers/HTML.hs
  tests/Tests/Writers/LaTeX.hs
@@ -162,17 +162,21 @@ License: UNKNOWN
 Files: src/Text/Pandoc.hs
  src/Text/Pandoc/Parsing.hs
  src/Text/Pandoc/Readers/HTML.hs
+ src/Text/Pandoc/Readers/LaTeX.hs
+ src/Text/Pandoc/Readers/Markdown.hs
  src/Text/Pandoc/Readers/RST.hs
+ src/Text/Pandoc/Shared.hs
  src/Text/Pandoc/Writers/AsciiDoc.hs
  src/Text/Pandoc/Writers/Docbook.hs
  src/Text/Pandoc/Writers/HTML.hs
  src/Text/Pandoc/Writers/LaTeX.hs
+ src/Text/Pandoc/Writers/Markdown.hs
  src/Text/Pandoc/Writers/Native.hs
  src/Text/Pandoc/Writers/RST.hs
  src/Text/Pandoc/Writers/RTF.hs
  src/Text/Pandoc/XML.hs
-Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
-  : 2006-2010, John MacFarlane
+Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2006-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -182,8 +186,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, John MacFarlane <jgm@berkeley.edu>
-  : 2012, John MacFarlane
+Copyright: 2012-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2012-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -201,8 +205,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, John MacFarlane <jgm@berkeley.edu>
-  : 2010, John MacFarlane
+Copyright: 2010-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2010-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -210,8 +214,8 @@ Files: src/Text/Pandoc/ImageSize.hs
  src/Text/Pandoc/MIME.hs
  src/Text/Pandoc/Readers/Native.hs
  src/Text/Pandoc/SelfContained.hs
-Copyright: 2011, John MacFarlane <jgm@berkeley.edu>
-  : 2011, John MacFarlane
+Copyright: 2011-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2011-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -219,32 +223,31 @@ 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, John MacFarlane <jgm@berkeley.edu>
-  : 2013, John MacFarlane
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Readers/Markdown.hs
- src/Text/Pandoc/Shared.hs
- src/Text/Pandoc/Writers/Markdown.hs
-Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
-  2006-2013, John MacFarlane <jgm@berkeley.edu>
-  : 2006-2013, John MacFarlane
+Copyright: 2013-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2013-2014, 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-2010, John MacFarlane <jgm@berkeley.edu>
-  : 2007-2010, John MacFarlane
+Copyright: 2007-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2007-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
-Files: src/Text/Pandoc/Writers/MediaWiki.hs
+Files: src/Text/Pandoc/Highlighting.hs
+ src/Text/Pandoc/Writers/MediaWiki.hs
  src/Text/Pandoc/Writers/ODT.hs
-Copyright: 2008-2010, John MacFarlane <jgm@berkeley.edu>
-  : 2008-2010, John MacFarlane
+Copyright: 2008-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2008-2014, John MacFarlane
+License: GPL-2+
+ FIXME
+
+Files: Setup.hs
+ benchmark/benchmark-pandoc.hs
+Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
+  2012-2014, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
@@ -254,59 +257,53 @@ Copyright: </li>
 License: UNKNOWN
  FIXME
 
-Files: src/Text/Pandoc/Readers/LaTeX.hs
-Copyright: 2006-2012, John MacFarlane <jgm@berkeley.edu>
-  : 2006-2012, John MacFarlane
-License: GPL-2+
- FIXME
-
 Files: pandoc.hs
-Copyright: 2006-2013, John MacFarlane <jgm@berkeley.edu>
-  2006-2013, John MacFarlane\n" ++
-  : 2006-2013, John MacFarlane
-License: GPL-2+
- FIXME
-
-Files: src/Text/Pandoc/Highlighting.hs
-Copyright: 2008, John MacFarlane <jgm@berkeley.edu>
-  : 2008, John MacFarlane
+Copyright: 2006-2014, John MacFarlane <jgm@berkeley.edu>
+  2006-2014, John MacFarlane\n" ++
+  : 2006-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/OpenDocument.hs
-Copyright: 2008-2010, Andrea Rossato <andrea.rossato@ing.unitn.it>
-  : 2008-2010, Andrea Rossato and John MacFarlane
+Copyright: 2008-2014, Andrea Rossato <andrea.rossato@ing.unitn.it>
+  : 2008-2014, Andrea Rossato and John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/Texinfo.hs
-Copyright: 2008-2010, John MacFarlane and Peter Wang
-  : 2008-2010, John MacFarlane and Peter Wang
+Copyright: 2008-2014, John MacFarlane and Peter Wang
+  : 2008-2014, John MacFarlane and Peter Wang
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Templates.hs
-Copyright: 2009-2013, John MacFarlane <jgm@berkeley.edu>
-  : 2009-2013, John MacFarlane
+Copyright: 2009-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2009-2014, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/EPUB.hs
-Copyright: 2010, John MacFarlane <jgm@berkeley.edu>
-  : 2010, John MacFarlane
+Copyright: 2010-2014, John MacFarlane <jgm@berkeley.edu>
+  : 2010-2014, 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
+License: GPL-2+
+ FIXME
+
 Files: src/Text/Pandoc/Writers/Org.hs
-Copyright: 2006-2010, Puneeth Chaganti <punchagan@gmail.com>
-  : 2010, Puneeth Chaganti
+Copyright: 2010-2014, Puneeth Chaganti <punchagan@gmail.com>
+  : 2010-2014, Puneeth Chaganti and John MacFarlane
 License: GPL-2+
  FIXME
 
-Files: src/Text/Pandoc/Readers/Textile.hs
-Copyright: 2010, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
-  : 2010-2012, Paul Rivier and John MacFarlane
+Files: src/Text/Pandoc/Readers/Org.hs
+Copyright: 2014, Albert Krewinkel <tarleb@moltkeplatz.de>
+  : 2014, Albert Krewinkel
 License: GPL-2+
  FIXME
 
@@ -315,6 +312,13 @@ Copyright: 2011-2012, Sergey Astanin
 License: GPL-2+
  FIXME
 
+Files: debian/rules
+Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
+  2007-2008, Recai Oktaş <roktas@debian.org>
+  2008-2014, Jonas Smedegaard <dr@jones.dk>
+License: GPL-3+
+ FIXME
+
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
   <year> <name of author>
@@ -341,6 +345,11 @@ Copyright: : 2013, David Lazar
 License: UNKNOWN
  FIXME
 
+Files: src/Text/Pandoc/Writers/ICML.hs
+Copyright: : 2013, github.com/mb21
+License: UNKNOWN
+ FIXME
+
 Files: tests/writer.fb2
 Copyright: </p><p>AT&amp;T has an ampersand in their name.</p><p>AT&amp;T is another way to write it.</p><p>This &amp; that.</p><p>4 &lt; 5.</p><p>6 &gt; 5.</p><p>Backslash: \</p><p>Backtick: `</p><p>Asterisk: *</p><p>Underscore: _</p><p>Left brace: {</p><p>Right brace: }</p><p>Left bracket: [</p><p>Right bracket:
 License: UNKNOWN
@@ -360,7 +369,7 @@ License: UNKNOWN
  FIXME
 
 Files: pandoc.cabal
-Copyright: 2006-2013, John MacFarlane
+Copyright: 2006-2014, John MacFarlane
 License: UNKNOWN
  FIXME
 
@@ -407,13 +416,12 @@ License: UNKNOWN
 Files: COPYRIGHT
 Copyright: 2004, Peter Jipsen http://www.chapman.edu/~jipsen
   2005, Peter Jipsen
-  2006-2013, John MacFarlane <jgm at berkeley dot edu>
-  2007, Jared Breland
-  2008-2010, Andrea Rossato
-  2008-2010, Andrea Rossato and John MacFarlane
-  2008-2010, John MacFarlane and Peter Wang
-  2010, Paul Rivier
-  2010, Puneeth Chaganti
+  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+
  FIXME