Prepare for release: Update changelog, control file and copyright hints.

1 files changed, 26 insertions, 20 deletions

diff --git a/debian/copyright_hints b/debian/copyright_hints
index 7e09827a8..390a1d054 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,7 +7,6 @@ Disclaimer: Autogenerated by CDBS
 Files: BUGS
  Benchmark.hs
  INSTALL
- MakeManPage.hs
  Setup.hs
  debian/README.source
  debian/TODO
@@ -20,12 +19,16 @@ 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
@@ -41,17 +44,6 @@ Files: BUGS
  s5/default/slides.js
  slideous/slideous.css
  slideous/slideous.js
- src/Tests/Arbitrary.hs
- src/Tests/Helpers.hs
- src/Tests/Old.hs
- src/Tests/Readers/LaTeX.hs
- src/Tests/Readers/RST.hs
- src/Tests/Shared.hs
- src/Tests/Writers/ConTeXt.hs
- src/Tests/Writers/HTML.hs
- src/Tests/Writers/Markdown.hs
- src/Tests/Writers/Native.hs
- src/test-pandoc.hs
  templates/default.asciidoc
  templates/default.beamer
  templates/default.context
@@ -76,8 +68,20 @@ Files: BUGS
  templates/epub-coverimage.html
  templates/epub-page.html
  templates/epub-titlepage.html
+ tests/Tests/Arbitrary.hs
+ tests/Tests/Helpers.hs
+ tests/Tests/Old.hs
+ tests/Tests/Readers/LaTeX.hs
+ tests/Tests/Readers/RST.hs
+ tests/Tests/Shared.hs
+ tests/Tests/Writers/ConTeXt.hs
+ tests/Tests/Writers/HTML.hs
+ tests/Tests/Writers/LaTeX.hs
+ tests/Tests/Writers/Markdown.hs
+ tests/Tests/Writers/Native.hs
  tests/biblio.bib
  tests/chicago-author-date.csl
+ tests/docbook-reader.docbook
  tests/ieee.csl
  tests/insert
  tests/latex-reader.latex
@@ -122,6 +126,7 @@ Files: BUGS
  tests/tables.texinfo
  tests/tables.textile
  tests/tables.txt
+ tests/test-pandoc.hs
  tests/testsuite.native
  tests/testsuite.txt
  tests/textile-reader.native
@@ -197,6 +202,13 @@ Copyright: 2012, John MacFarlane <jgm@berkeley.edu>
 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
@@ -212,12 +224,6 @@ Copyright: 2008-2010, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
  FIXME
 
-Files: tests/html-reader.native
- tests/latex-reader.native
-Copyright: ",Space,Str "\169"
-License: UNKNOWN
- FIXME
-
 Files: tests/html-reader.html
  tests/writer.html
 Copyright: </li>
@@ -339,7 +345,7 @@ Copyright: \u169?\sa180\par}
 License: UNKNOWN
  FIXME
 
-Files: src/Tests/Readers/Markdown.hs
+Files: tests/Tests/Readers/Markdown.hs
 Copyright: du socialisme»"
   du socialisme»"))
 License: UNKNOWN
@@ -368,6 +374,6 @@ Copyright: 2004, Peter Jipsen http://www.chapman.edu/~jipsen
   2008-2010, John MacFarlane and Peter Wang
   2010, Paul Rivier
   2010, Puneeth Chaganti
-License: WTFPL
+License: WTFPL GPL-2+
  FIXME