Update changelog, control file and copyright hints.

1 files changed, 148 insertions, 102 deletions

diff --git a/debian/control b/debian/control
index 73bbe3206..1e28c590f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,24 +14,26 @@ Build-Depends: cdbs,
  happy,
  libghc-unordered-containers-dev (<< 3),
  libghc-parsec3-dev (<< 3.2),
- libghc-mtl-dev (<< 2.2),
- libghc-network-dev (<< 2.5),
+ libghc-mtl-dev (<< 2.3),
+ libghc-network-dev (<< 2.6),
  libghc-text-dev (<< 1.2),
  libghc-zip-archive-dev (>= 0.1.3.3),
  libghc-zip-archive-dev (<< 0.3),
  libghc-http-dev (<< 1:4000.3),
- libghc-texmath-dev (>= 0.6.6),
+ libghc-texmath-dev (>= 0.6.6.1),
  libghc-texmath-dev (<< 0.7),
  libghc-xml-dev (<< 1.4),
  libghc-random-dev (<<1.1 ),
  libghc-extensible-exceptions-dev (<< 0.2),
- libghc-pandoc-types-dev (>= 1.12),
+ libghc-pandoc-types-dev (>= 1.12.3.3),
  libghc-pandoc-types-dev (<< 1.13),
+ libghc-aeson-dev (>= 0.7),
  libghc-aeson-dev (<< 0.8),
+ libghc-tagsoup-dev (>= 0.13.1),
  libghc-tagsoup-dev (<< 0.14),
  libghc-base64-bytestring-dev (<< 1.1),
  libghc-zlib-dev (<< 0.6),
- libghc-highlighting-kate-dev (>= 0.5.6),
+ libghc-highlighting-kate-dev (>= 0.5.8),
  libghc-highlighting-kate-dev (<< 0.6),
  libghc-data-default-dev (>= 0.4),
  libghc-data-default-dev (<< 0.6),
@@ -40,11 +42,13 @@ Build-Depends: cdbs,
  libghc-blaze-html-dev (<< 0.8),
  libghc-blaze-markup-dev (<< 0.8),
  libghc-attoparsec-dev (<< 0.12),
- libghc-yaml-dev (>= 0.8.3),
+ libghc-yaml-dev (>= 0.8.8.2),
  libghc-yaml-dev (<< 0.9),
+ libghc-scientific-dev (>= 0.2),
+ libghc-scientific-dev (<< 0.3),
  libghc-hslua-dev (<< 0.4),
  libghc-http-conduit-dev (>= 1.9),
- libghc-http-conduit-dev (<< 2.1),
+ libghc-http-conduit-dev (<< 2.2),
  libghc-http-types-dev (>= 0.8),
  libghc-http-types-dev (<< 0.9),
  libghc-text-dev (>= 0.11),
@@ -73,6 +77,7 @@ Build-Depends: cdbs,
  libghc-blaze-markup-prof,
  libghc-attoparsec-prof,
  libghc-yaml-prof,
+ libghc-scientific-prof,
  libghc-hslua-prof,
  libghc-http-conduit-prof,
  libghc-http-types-prof,
@@ -103,6 +108,7 @@ Build-Depends-Indep: ghc-doc
   , libghc-blaze-markup-doc
   , libghc-attoparsec-doc
   , libghc-yaml-doc
+  , libghc-scientific-doc
   , libghc-hslua-doc
   , libghc-http-conduit-doc
   , libghc-http-types-doc
@@ -128,27 +134,35 @@ Depends: ${cdbs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
 Description: general markup converter
- Pandoc is a Haskell library for converting from one markup format to
- another, and a command-line tool that uses this library. It can read
- markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, Haddock markup, OPML, and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX (including rendering as plain
- PDF or beamer slide shows), ConTeXt, DocBook, OPML, OpenDocument, ODT,
- Word docx, RTF, MediaWiki, Textile, groff man pages, GNU Texinfo, plain
- text, Emacs Org-Mode, AsciiDoc, EPUB (v2 or v3), FictionBook2, and
- several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
- DZSlides, reveal.js).
+ Pandoc is a Haskell library for converting
+ from one markup format to another,
+ and a command-line tool that uses this library.
+ It can read markdown and (subsets of) HTML, reStructuredText,
+ LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ OPML, Emacs Org-mode, and Textile,
+ and it can write markdown, reStructuredText, HTML,
+ LaTeX (including rendering as plain PDF or beamer slide shows),
+ ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, Textile, groff man pages, GNU Texinfo, plain text,
+ Emacs Org-Mode, AsciiDoc, InDesign ICML, EPUB (v2 or v3), FictionBook2,
+ and several kinds of HTML/javascript slide shows
+ (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
- Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
- definition lists, tables, and other features. A compatibility mode is
- provided for those who need a drop-in replacement for Markdown.pl.
+ Pandoc extends standard markdown syntax
+ with footnotes, embedded LaTeX, definition lists, tables,
+ and other features.
+ A compatibility mode is provided
+ for those who need a drop-in replacement for Markdown.pl.
  .
- In contrast to existing tools for converting markdown to HTML, which
- use regex substitutions, pandoc has a modular design: it consists of a
- set of readers, which parse text in a given format and produce a native
- representation of the document, and a set of writers, which convert
- this native representation into a target format. Thus, adding an input
- or output format requires only adding a reader or writer.
+ In contrast to existing tools for converting markdown to HTML,
+ which use regex substitutions,
+ pandoc has a modular design:
+ it consists of a set of readers, which parse text in a given format
+ and produce a native representation of the document,
+ and a set of writers,
+ which convert this native representation into a target format.
+ Thus,
+ adding an input or output format requires only adding a reader or writer.
  .
  This package contains the pandoc tool.
  .
@@ -164,27 +178,35 @@ Depends: ${cdbs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
 Description: general markup converter - data files
- Pandoc is a Haskell library for converting from one markup format to
- another, and a command-line tool that uses this library. It can read
- markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, Haddock markup, OPML, and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX (including rendering as plain
- PDF or beamer slide shows), ConTeXt, DocBook, OPML, OpenDocument, ODT,
- Word docx, RTF, MediaWiki, Textile, groff man pages, GNU Texinfo, plain
- text, Emacs Org-Mode, AsciiDoc, EPUB (v2 or v3), FictionBook2, and
- several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
- DZSlides, reveal.js).
+ Pandoc is a Haskell library for converting
+ from one markup format to another,
+ and a command-line tool that uses this library.
+ It can read markdown and (subsets of) HTML, reStructuredText,
+ LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ OPML, Emacs Org-mode, and Textile,
+ and it can write markdown, reStructuredText, HTML,
+ LaTeX (including rendering as plain PDF or beamer slide shows),
+ ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, Textile, groff man pages, GNU Texinfo, plain text,
+ Emacs Org-Mode, AsciiDoc, InDesign ICML, EPUB (v2 or v3), FictionBook2,
+ and several kinds of HTML/javascript slide shows
+ (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
- Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
- definition lists, tables, and other features. A compatibility mode is
- provided for those who need a drop-in replacement for Markdown.pl.
+ Pandoc extends standard markdown syntax
+ with footnotes, embedded LaTeX, definition lists, tables,
+ and other features.
+ A compatibility mode is provided
+ for those who need a drop-in replacement for Markdown.pl.
  .
- In contrast to existing tools for converting markdown to HTML, which
- use regex substitutions, pandoc has a modular design: it consists of a
- set of readers, which parse text in a given format and produce a native
- representation of the document, and a set of writers, which convert
- this native representation into a target format. Thus, adding an input
- or output format requires only adding a reader or writer.
+ In contrast to existing tools for converting markdown to HTML,
+ which use regex substitutions,
+ pandoc has a modular design:
+ it consists of a set of readers, which parse text in a given format
+ and produce a native representation of the document,
+ and a set of writers,
+ which convert this native representation into a target format.
+ Thus,
+ adding an input or output format requires only adding a reader or writer.
  .
  This package contains the data files for pandoc.
 
@@ -201,27 +223,35 @@ Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
 Description: general markup converter - libraries
- Pandoc is a Haskell library for converting from one markup format to
- another, and a command-line tool that uses this library. It can read
- markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, Haddock markup, OPML, and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX (including rendering as plain
- PDF or beamer slide shows), ConTeXt, DocBook, OPML, OpenDocument, ODT,
- Word docx, RTF, MediaWiki, Textile, groff man pages, GNU Texinfo, plain
- text, Emacs Org-Mode, AsciiDoc, EPUB (v2 or v3), FictionBook2, and
- several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
- DZSlides, reveal.js).
+ Pandoc is a Haskell library for converting
+ from one markup format to another,
+ and a command-line tool that uses this library.
+ It can read markdown and (subsets of) HTML, reStructuredText,
+ LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ OPML, Emacs Org-mode, and Textile,
+ and it can write markdown, reStructuredText, HTML,
+ LaTeX (including rendering as plain PDF or beamer slide shows),
+ ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, Textile, groff man pages, GNU Texinfo, plain text,
+ Emacs Org-Mode, AsciiDoc, InDesign ICML, EPUB (v2 or v3), FictionBook2,
+ and several kinds of HTML/javascript slide shows
+ (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
- Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
- definition lists, tables, and other features. A compatibility mode is
- provided for those who need a drop-in replacement for Markdown.pl.
+ Pandoc extends standard markdown syntax
+ with footnotes, embedded LaTeX, definition lists, tables,
+ and other features.
+ A compatibility mode is provided
+ for those who need a drop-in replacement for Markdown.pl.
  .
- In contrast to existing tools for converting markdown to HTML, which
- use regex substitutions, pandoc has a modular design: it consists of a
- set of readers, which parse text in a given format and produce a native
- representation of the document, and a set of writers, which convert
- this native representation into a target format. Thus, adding an input
- or output format requires only adding a reader or writer.
+ In contrast to existing tools for converting markdown to HTML,
+ which use regex substitutions,
+ pandoc has a modular design:
+ it consists of a set of readers, which parse text in a given format
+ and produce a native representation of the document,
+ and a set of writers,
+ which convert this native representation into a target format.
+ Thus,
+ adding an input or output format requires only adding a reader or writer.
  .
  This package contains the libraries compiled for GHC.
 
@@ -234,27 +264,35 @@ Depends: ${haskell:Depends}
  , ${misc:Depends}
 Recommends: ${haskell:Recommends}
 Description: general markup converter - library documentation
- Pandoc is a Haskell library for converting from one markup format to
- another, and a command-line tool that uses this library. It can read
- markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, Haddock markup, OPML, and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX (including rendering as plain
- PDF or beamer slide shows), ConTeXt, DocBook, OPML, OpenDocument, ODT,
- Word docx, RTF, MediaWiki, Textile, groff man pages, GNU Texinfo, plain
- text, Emacs Org-Mode, AsciiDoc, EPUB (v2 or v3), FictionBook2, and
- several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
- DZSlides, reveal.js).
+ Pandoc is a Haskell library for converting
+ from one markup format to another,
+ and a command-line tool that uses this library.
+ It can read markdown and (subsets of) HTML, reStructuredText,
+ LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ OPML, Emacs Org-mode, and Textile,
+ and it can write markdown, reStructuredText, HTML,
+ LaTeX (including rendering as plain PDF or beamer slide shows),
+ ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, Textile, groff man pages, GNU Texinfo, plain text,
+ Emacs Org-Mode, AsciiDoc, InDesign ICML, EPUB (v2 or v3), FictionBook2,
+ and several kinds of HTML/javascript slide shows
+ (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
- Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
- definition lists, tables, and other features. A compatibility mode is
- provided for those who need a drop-in replacement for Markdown.pl.
+ Pandoc extends standard markdown syntax
+ with footnotes, embedded LaTeX, definition lists, tables,
+ and other features.
+ A compatibility mode is provided
+ for those who need a drop-in replacement for Markdown.pl.
  .
- In contrast to existing tools for converting markdown to HTML, which
- use regex substitutions, pandoc has a modular design: it consists of a
- set of readers, which parse text in a given format and produce a native
- representation of the document, and a set of writers, which convert
- this native representation into a target format. Thus, adding an input
- or output format requires only adding a reader or writer.
+ In contrast to existing tools for converting markdown to HTML,
+ which use regex substitutions,
+ pandoc has a modular design:
+ it consists of a set of readers, which parse text in a given format
+ and produce a native representation of the document,
+ and a set of writers,
+ which convert this native representation into a target format.
+ Thus,
+ adding an input or output format requires only adding a reader or writer.
  .
  This package contains the library documentation for Pandoc.
 
@@ -268,26 +306,34 @@ Depends: ${haskell:Depends}
 Suggests: ${cdbs:Suggests}
 Provides: ${haskell:Provides}
 Description: general markup converter - profiling libraries
- Pandoc is a Haskell library for converting from one markup format to
- another, and a command-line tool that uses this library. It can read
- markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
- MediaWiki markup, Haddock markup, OPML, and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX (including rendering as plain
- PDF or beamer slide shows), ConTeXt, DocBook, OPML, OpenDocument, ODT,
- Word docx, RTF, MediaWiki, Textile, groff man pages, GNU Texinfo, plain
- text, Emacs Org-Mode, AsciiDoc, EPUB (v2 or v3), FictionBook2, and
- several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
- DZSlides, reveal.js).
+ Pandoc is a Haskell library for converting
+ from one markup format to another,
+ and a command-line tool that uses this library.
+ It can read markdown and (subsets of) HTML, reStructuredText,
+ LaTeX, DocBook, MediaWiki markup, Haddock markup,
+ OPML, Emacs Org-mode, and Textile,
+ and it can write markdown, reStructuredText, HTML,
+ LaTeX (including rendering as plain PDF or beamer slide shows),
+ ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
+ MediaWiki, Textile, groff man pages, GNU Texinfo, plain text,
+ Emacs Org-Mode, AsciiDoc, InDesign ICML, EPUB (v2 or v3), FictionBook2,
+ and several kinds of HTML/javascript slide shows
+ (S5, Slidy, Slideous, DZSlides, reveal.js).
  .
- Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
- definition lists, tables, and other features. A compatibility mode is
- provided for those who need a drop-in replacement for Markdown.pl.
+ Pandoc extends standard markdown syntax
+ with footnotes, embedded LaTeX, definition lists, tables,
+ and other features.
+ A compatibility mode is provided
+ for those who need a drop-in replacement for Markdown.pl.
  .
- In contrast to existing tools for converting markdown to HTML, which
- use regex substitutions, pandoc has a modular design: it consists of a
- set of readers, which parse text in a given format and produce a native
- representation of the document, and a set of writers, which convert
- this native representation into a target format. Thus, adding an input
- or output format requires only adding a reader or writer.
+ In contrast to existing tools for converting markdown to HTML,
+ which use regex substitutions,
+ pandoc has a modular design:
+ it consists of a set of readers, which parse text in a given format
+ and produce a native representation of the document,
+ and a set of writers,
+ which convert this native representation into a target format.
+ Thus,
+ adding an input or output format requires only adding a reader or writer.
  .
  This package contains the profiling libraries for Pandoc.