Update changelog, control file and copyright hints.

1 files changed, 99 insertions, 74 deletions

diff --git a/debian/copyright_hints b/debian/copyright_hints
index 390a1d054..440c57f1b 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,9 +5,47 @@ Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
 Files: BUGS
- Benchmark.hs
  INSTALL
  Setup.hs
+ benchmark/benchmark-pandoc.hs
+ data/default.csl
+ data/dzslides/template.html
+ data/epub.css
+ data/reference.docx
+ data/s5/default/framing.css
+ data/s5/default/iepngfix.htc
+ data/s5/default/opera.css
+ data/s5/default/outline.css
+ data/s5/default/pretty.css
+ data/s5/default/print.css
+ data/s5/default/s5-core.css
+ data/s5/default/slides.css
+ data/s5/default/slides.js
+ data/slideous/slideous.css
+ data/slideous/slideous.js
+ data/templates/default.asciidoc
+ data/templates/default.beamer
+ data/templates/default.context
+ data/templates/default.docbook
+ data/templates/default.dzslides
+ data/templates/default.epub
+ data/templates/default.epub3
+ data/templates/default.html
+ data/templates/default.html5
+ data/templates/default.latex
+ data/templates/default.man
+ data/templates/default.markdown
+ data/templates/default.mediawiki
+ data/templates/default.opendocument
+ data/templates/default.org
+ data/templates/default.plain
+ data/templates/default.rst
+ data/templates/default.rtf
+ data/templates/default.s5
+ data/templates/default.slideous
+ data/templates/default.slidy
+ data/templates/default.texinfo
+ data/templates/default.textile
  debian/README.source
  debian/TODO
  debian/compat
@@ -19,55 +57,13 @@ Files: BUGS
  debian/pandoc.README.Debian
  debian/pandoc.install.in
  debian/pandoc.links
- debian/patches/different-distpath.diff
- debian/patches/no-threaded-runtime.patch
- debian/patches/series
  debian/rules
  debian/source/format
  debian/watch
- default.csl
- dzslides/template.html
- epub.css
  man/make-pandoc-man-pages.hs
  man/man1/pandoc.1.template
  man/man5/pandoc_markdown.5
  man/man5/pandoc_markdown.5.template
- reference.docx
- s5/default/framing.css
- s5/default/iepngfix.htc
- s5/default/opera.css
- s5/default/outline.css
- s5/default/pretty.css
- s5/default/print.css
- s5/default/s5-core.css
- s5/default/slides.css
- s5/default/slides.js
- slideous/slideous.css
- slideous/slideous.js
- templates/default.asciidoc
- templates/default.beamer
- templates/default.context
- templates/default.docbook
- templates/default.dzslides
- templates/default.html
- templates/default.html5
- templates/default.latex
- templates/default.man
- templates/default.markdown
- templates/default.mediawiki
- templates/default.opendocument
- templates/default.org
- templates/default.plain
- templates/default.rst
- templates/default.rtf
- templates/default.s5
- templates/default.slideous
- templates/default.slidy
- templates/default.texinfo
- templates/default.textile
- templates/epub-coverimage.html
- templates/epub-page.html
- templates/epub-titlepage.html
  tests/Tests/Arbitrary.hs
  tests/Tests/Helpers.hs
  tests/Tests/Old.hs
@@ -82,9 +78,21 @@ Files: BUGS
  tests/biblio.bib
  tests/chicago-author-date.csl
  tests/docbook-reader.docbook
+ tests/fb2.basic.fb2
+ tests/fb2.basic.markdown
+ tests/fb2.images-embedded.fb2
+ tests/fb2.images-embedded.html
+ tests/fb2.images.fb2
+ tests/fb2.images.markdown
+ tests/fb2.math.fb2
+ tests/fb2.math.markdown
+ tests/fb2.test-small.png
+ tests/fb2.titles.fb2
+ tests/fb2.titles.markdown
  tests/ieee.csl
  tests/insert
  tests/latex-reader.latex
+ tests/lhs-test-markdown.native
  tests/lhs-test.fragment.html+lhs
  tests/lhs-test.html
  tests/lhs-test.html+lhs
@@ -101,8 +109,11 @@ Files: BUGS
  tests/markdown-citations.txt
  tests/markdown-reader-more.native
  tests/markdown-reader-more.txt
+ tests/mediawiki-reader.native
+ tests/mediawiki-reader.wiki
  tests/mhra.csl
- tests/rst-reader.native
+ tests/pipe-tables.native
+ tests/pipe-tables.txt
  tests/rst-reader.rst
  tests/s5.basic.html
  tests/s5.fragment.html
@@ -112,6 +123,7 @@ Files: BUGS
  tests/tables.asciidoc
  tests/tables.context
  tests/tables.docbook
+ tests/tables.fb2
  tests/tables.html
  tests/tables.latex
  tests/tables.man
@@ -127,7 +139,6 @@ Files: BUGS
  tests/tables.textile
  tests/tables.txt
  tests/test-pandoc.hs
- tests/testsuite.native
  tests/testsuite.txt
  tests/textile-reader.native
  tests/writer.asciidoc
@@ -137,7 +148,6 @@ Files: BUGS
  tests/writer.man
  tests/writer.markdown
  tests/writer.mediawiki
- tests/writer.native
  tests/writer.org
  tests/writer.plain
  tests/writer.rst
@@ -167,6 +177,16 @@ Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
+Files: tests/docbook-reader.native
+ tests/html-reader.native
+ tests/latex-reader.native
+ tests/rst-reader.native
+ tests/testsuite.native
+ tests/writer.native
+Copyright: ",Space,Str "\169"
+License: UNKNOWN
+ FIXME
+
 Files: src/Text/Pandoc/Pretty.hs
  src/Text/Pandoc/UTF8.hs
  src/Text/Pandoc/UUID.hs
@@ -177,6 +197,16 @@ Copyright: 2010, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
+Files: src/Text/Pandoc/Options.hs
+ src/Text/Pandoc/PDF.hs
+ src/Text/Pandoc/Readers/MediaWiki.hs
+ src/Text/Pandoc/Slides.hs
+ src/Text/Pandoc/Writers/Docx.hs
+Copyright: 2012, John MacFarlane <jgm@berkeley.edu>
+  : 2012, John MacFarlane
+License: GPL-2+
+ FIXME
+
 Files: src/Text/Pandoc/ImageSize.hs
  src/Text/Pandoc/MIME.hs
  src/Text/Pandoc/Readers/Native.hs
@@ -194,21 +224,6 @@ Copyright: 2007-2010, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
-Files: src/Text/Pandoc/PDF.hs
- src/Text/Pandoc/Slides.hs
- src/Text/Pandoc/Writers/Docx.hs
-Copyright: 2012, John MacFarlane <jgm@berkeley.edu>
-  : 2012, John MacFarlane
-License: GPL-2+
- FIXME
-
-Files: tests/docbook-reader.native
- tests/html-reader.native
- tests/latex-reader.native
-Copyright: ",Space,Str "\169"
-License: UNKNOWN
- FIXME
-
 Files: data/LaTeXMathML.js
  data/MathMLinHTML.js
  tests/s5.fancy.html
@@ -236,10 +251,10 @@ Copyright: 2006-2012, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
-Files: src/pandoc.hs
-Copyright: 2006-2012, John MacFarlane <jgm@berkeley.edu>
-  2006-2012, John MacFarlane\n" ++
-  : 2006-2012, John MacFarlane
+Files: pandoc.hs
+Copyright: 2006-2013, John MacFarlane <jgm@berkeley.edu>
+  2006-2013, John MacFarlane\n" ++
+  : 2006-2013, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -285,6 +300,11 @@ Copyright: 2010, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
 License: GPL-2+
  FIXME
 
+Files: src/Text/Pandoc/Writers/FB2.hs
+Copyright: 2011-2012, Sergey Astanin
+License: GPL-2+
+ FIXME
+
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
   <year> <name of author>
@@ -305,12 +325,17 @@ Copyright: 2008
 License: UNKNOWN
  FIXME
 
-Files: slidy/scripts/slidy.js.gz
+Files: data/slidy/scripts/slidy.js.gz
 Copyright: ”­Õ'–h>7×íC“	ˆ5êȵ¥¿¡
Uïr¼ý¼&†JÂW›GŠÎÂ?fføo#ÕŠKi®+µÐ(ö
   ÖH—d˜„H½Q8•!<­¹œgÑGñX

 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
+ FIXME
+
 Files: tests/writer.opendocument
 Copyright: </text:p>
 License: UNKNOWN
@@ -324,19 +349,19 @@ License: UNKNOWN
  FIXME
 
 Files: pandoc.cabal
-Copyright: 2006-2012, John MacFarlane
+Copyright: 2006-2013, John MacFarlane
 License: UNKNOWN
  FIXME
 
-Files: man/man1/pandoc.1
-Copyright: 2006-2011, John MacFarlane (jgm at berkeley dot edu)
-  for full and warranty notices.)
+Files: data/slidy/styles/slidy.css
+Copyright: 2005-2010, W3C (MIT, ERCIM, Keio)
+  { font-size: smaller }
 License: UNKNOWN
  FIXME
 
-Files: slidy/styles/slidy.css
-Copyright: 2005-2010, W3C (MIT, ERCIM, Keio)
-  { font-size: smaller }
+Files: man/man1/pandoc.1
+Copyright: 2006\-2011, John MacFarlane (jgm at berkeley dot edu)
+  for full and warranty notices.) Other
 License: UNKNOWN
  FIXME
 
@@ -367,7 +392,7 @@ License: UNKNOWN
 Files: COPYRIGHT
 Copyright: 2004, Peter Jipsen http://www.chapman.edu/~jipsen
   2005, Peter Jipsen
-  2006-2012, John MacFarlane <jgm at berkeley dot edu>
+  2006-2013, John MacFarlane <jgm at berkeley dot edu>
   2007, Jared Breland
   2008-2010, Andrea Rossato
   2008-2010, Andrea Rossato and John MacFarlane