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

1 files changed, 45 insertions, 46 deletions

diff --git a/debian/copyright_hints b/debian/copyright_hints
index 68359fc1e..2dbe45676 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
@@ -23,7 +23,6 @@ Files: BUGS
  debian/pandoc.links
  debian/rules
  debian/source/format
- debian/source/local-options
  debian/watch
  default.csl
  dzslides/template.html
@@ -157,7 +156,7 @@ Files: src/Text/Pandoc.hs
  src/Text/Pandoc/Writers/RTF.hs
  src/Text/Pandoc/XML.hs
 Copyright: 2006-2010, John MacFarlane <jgm@berkeley.edu>
- : 2006-2010, John MacFarlane
+  : 2006-2010, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -167,7 +166,7 @@ Files: src/Text/Pandoc/Pretty.hs
  src/Text/Pandoc/Writers/EPUB.hs
  src/Text/Pandoc/Writers/Textile.hs
 Copyright: 2010, John MacFarlane <jgm@berkeley.edu>
- : 2010, John MacFarlane
+  : 2010, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -176,7 +175,7 @@ Files: src/Text/Pandoc/ImageSize.hs
  src/Text/Pandoc/Readers/Native.hs
  src/Text/Pandoc/SelfContained.hs
 Copyright: 2011, John MacFarlane <jgm@berkeley.edu>
- : 2011, John MacFarlane
+  : 2011, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -184,7 +183,7 @@ 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
+  : 2007-2010, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -192,7 +191,7 @@ 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
+  : 2012, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -200,14 +199,14 @@ Files: data/LaTeXMathML.js
  data/MathMLinHTML.js
  tests/s5.fancy.html
 Copyright: 2005, Peter Jipsen http://www.chapman.edu/~jipsen
- Peter Jipsen http://www.chapman.edu/~jipsen
+  Peter Jipsen http://www.chapman.edu/~jipsen
 License: UNKNOWN
  FIXME
 
 Files: src/Text/Pandoc/Writers/MediaWiki.hs
  src/Text/Pandoc/Writers/ODT.hs
 Copyright: 2008-2010, John MacFarlane <jgm@berkeley.edu>
- : 2008-2010, John MacFarlane
+  : 2008-2010, John MacFarlane
 License: GPL-2+
  FIXME
 
@@ -225,71 +224,71 @@ License: UNKNOWN
 
 Files: src/Text/Pandoc/Readers/LaTeX.hs
 Copyright: 2006-2012, John MacFarlane <jgm@berkeley.edu>
- : 2006-2012, John MacFarlane
+  : 2006-2012, John MacFarlane
 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
+  2006-2012, John MacFarlane\n" ++
+  : 2006-2012, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Highlighting.hs
 Copyright: 2008, John MacFarlane <jgm@berkeley.edu>
- : 2008, John MacFarlane
+  : 2008, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Biblio.hs
 Copyright: 2008, Andrea Rossato <andrea.rossato@ing.unitn.it>
- : 2008-2010, Andrea Rossato
+  : 2008-2010, Andrea Rossato
 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
+  : 2008-2010, 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
+  : 2008-2010, John MacFarlane and Peter Wang
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Templates.hs
 Copyright: 2009-2010, John MacFarlane <jgm@berkeley.edu>
- : 2009-2010, John MacFarlane
+  : 2009-2010, John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Writers/Org.hs
 Copyright: 2006-2010, Puneeth Chaganti <punchagan@gmail.com>
- : 2010, Puneeth Chaganti
+  : 2010, Puneeth Chaganti
 License: GPL-2+
  FIXME
 
 Files: src/Text/Pandoc/Readers/Textile.hs
 Copyright: 2010, Paul Rivier <paul*rivier#demotera*com> | tr '*#' '.@'
- : 2010-2011, Paul Rivier and John MacFarlane
+  : 2010-2011, Paul Rivier and John MacFarlane
 License: GPL-2+
  FIXME
 
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
- <year> <name of author>
- HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
- HOLDERS AND/OR OTHER PARTIES
- disclaimer" for the program, if
- holder saying it may be distributed
- holder who places the Program under this License
- interest in the program
- law:
- the software, and
- year name of author
+  <year> <name of author>
+  HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+  HOLDERS AND/OR OTHER PARTIES
+  disclaimer" for the program, if
+  holder saying it may be distributed
+  holder who places the Program under this License
+  interest in the program
+  law:
+  the software, and
+  year name of author
 License: GPL-2+
  FIXME
 
@@ -300,7 +299,7 @@ License: UNKNOWN
 
 Files: 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

+  ÖH—d˜„H½Q8•!<­¹œgÑGñX

 License: UNKNOWN
  FIXME
 
@@ -311,8 +310,8 @@ License: UNKNOWN
 
 Files: README
 Copyright: 2006-2011, John MacFarlane (jgm at berkeley dot edu). Released under the
- 2007, Joe Smith
- for full and warranty notices.)
+  2007, Joe Smith
+  for full and warranty notices.)
 License: UNKNOWN
  FIXME
 
@@ -323,13 +322,13 @@ License: UNKNOWN
 
 Files: man/man1/pandoc.1
 Copyright: 2006-2011, John MacFarlane (jgm at berkeley dot edu)
- for full and warranty notices.)
+  for full and warranty notices.)
 License: UNKNOWN
  FIXME
 
 Files: slidy/styles/slidy.css
 Copyright: 2005-2010, W3C (MIT, ERCIM, Keio)
- { font-size: smaller }
+  { font-size: smaller }
 License: UNKNOWN
  FIXME
 
@@ -340,28 +339,28 @@ License: UNKNOWN
 
 Files: src/Tests/Readers/Markdown.hs
 Copyright: du socialisme»"
- du socialisme»"))
+  du socialisme»"))
 License: UNKNOWN
  FIXME
 
 Files: changelog
 Copyright: file
- in top level a symlink to debian/, to avoid
- message in Main.hs
- message to '-v' output, modeled after FSF messages
+  in top level a symlink to debian/, to avoid
+  message in Main.hs
+  message to '-v' output, modeled after FSF messages
 License: UNKNOWN
  FIXME
 
 Files: COPYRIGHT
 Copyright: 2004, Peter Jipsen http://www.chapman.edu/~jipsen
- 2005, Peter Jipsen
- 2006-2012, 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
+  2005, Peter Jipsen
+  2006-2012, 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
 License: WTFPL
  FIXME