diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/copyright_hints | 46 |
3 files changed, 17 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index fc3107798..7dc552b88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ -pandoc (1.13.2.1~dfsg-2) UNRELEASED; urgency=medium +pandoc (1.14.0.4~dfsg-1) UNRELEASED; urgency=medium + [ upstream ] + * New release(s). + + [ Jonas Smedegaard ] * Update copyright info: + Exclude from repackaged upstream tarball yet another docx file lacking license. @@ -10,7 +14,7 @@ pandoc (1.13.2.1~dfsg-2) UNRELEASED; urgency=medium See bug#786450. * Update package relations: + Tighten GHC versioning for texmath highlighting-kate. - + Relax GHC versioning for zlib quickcheck2. + + Relax GHC versioning for zlib quickcheck2 aeson hslua syb. + Add GHC relations for css-text filemanip cmark. -- Jonas Smedegaard <dr@jones.dk> Thu, 28 May 2015 16:52:50 +0200 diff --git a/debian/control b/debian/control index 70ec40f13..7744c8697 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: cdbs, libghc-pandoc-types-dev (>= 1.12.4), libghc-pandoc-types-dev (<< 1.13), libghc-aeson-dev (>= 0.7.0.5), - libghc-aeson-dev (<< 0.9), + libghc-aeson-dev (<< 0.10), libghc-tagsoup-dev (>= 0.13.1), libghc-tagsoup-dev (<< 0.14), libghc-base64-bytestring-dev (<< 1.1), @@ -51,7 +51,7 @@ Build-Depends: cdbs, libghc-yaml-dev (>= 0.8.8.2), libghc-yaml-dev (<< 0.9), libghc-scientific-dev (<< 0.4), - libghc-hslua-dev (<< 0.4), + libghc-hslua-dev (<< 0.5), libghc-sha-dev (>= 1.6), libghc-sha-dev (<< 1.7), libghc-haddock-library-dev (<< 1.2), @@ -63,7 +63,7 @@ Build-Depends: cdbs, libghc-http-client-tls-dev (<< 0.3), libghc-http-types-dev (>= 0.8), libghc-http-types-dev (<< 0.9), - libghc-syb-dev (<< 0.5), + libghc-syb-dev (<< 0.6), ghc-prof, libghc-unordered-containers-prof, libghc-parsec3-prof, diff --git a/debian/copyright_hints b/debian/copyright_hints index 51ec107fe..6c4cf7986 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -24,7 +24,6 @@ Files: BUGS data/docx/word/webSettings.xml data/dzslides/template.html data/epub.css - data/make-reference-files.hs data/odt/META-INF/manifest.xml data/odt/Thumbnails/thumbnail.png.metadata_dump data/odt/content.xml @@ -33,10 +32,10 @@ Files: BUGS data/odt/mimetype data/odt/settings.xml data/odt/styles.xml - data/reference.docx.metadata_dump data/sample.lua data/templates/default.asciidoc data/templates/default.beamer + data/templates/default.commonmark data/templates/default.context data/templates/default.docbook data/templates/default.dokuwiki @@ -85,7 +84,6 @@ Files: BUGS debian/watch man/make-pandoc-man-pages.hs man/man1/pandoc.1.template - man/man5/pandoc_markdown.5 man/man5/pandoc_markdown.5.template src/Text/Pandoc/Compat/Directory.hs src/Text/Pandoc/Compat/Except.hs @@ -93,6 +91,7 @@ Files: BUGS src/Text/Pandoc/Compat/Monoid.hs src/Text/Pandoc/Compat/TagSoupEntity.hs src/Text/Pandoc/Data.hsb + src/Text/Pandoc/Readers/DocBook.hs src/Text/Pandoc/Readers/Docx/Reducible.hs src/Text/Pandoc/Readers/Docx/StyleMap.hs src/Text/Pandoc/Readers/Docx/Util.hs @@ -105,6 +104,8 @@ Files: BUGS tests/Tests/Readers/EPUB.hs tests/Tests/Readers/HTML.hs tests/Tests/Readers/LaTeX.hs + tests/Tests/Readers/Markdown.hs + tests/Tests/Readers/Org.hs tests/Tests/Readers/RST.hs tests/Tests/Readers/Txt2Tags.hs tests/Tests/Shared.hs @@ -266,11 +267,13 @@ Files: BUGS tests/writer.context tests/writer.docbook tests/writer.dokuwiki + tests/writer.fb2 tests/writer.haddock tests/writer.latex tests/writer.man tests/writer.markdown tests/writer.mediawiki + tests/writer.opml tests/writer.org tests/writer.plain tests/writer.rst @@ -417,13 +420,6 @@ Copyright: </li> License: UNKNOWN FIXME -Files: tests/Tests/Readers/Markdown.hs - tests/Tests/Readers/Org.hs -Copyright: du socialisme»" - du socialisme»") -License: UNKNOWN - FIXME - Files: src/Text/Pandoc/Readers/Native.hs Copyright: 2011-2015, John MacFarlane <jgm@berkeley.edu> : 2011-2015, John MacFarlane @@ -508,7 +504,6 @@ Files: COPYING Copyright: 1989, 1991 Free Software Foundation, Inc <year> <name of author> disclaimer" for the program, if - interest in the program law: the software, and year name of author @@ -520,11 +515,6 @@ Copyright: 2008 License: UNKNOWN FIXME -Files: tests/writer.opml -Copyright: AT&T has an ampersand in their name. AT&T is another way to write it. This & that. 4 &lt; 5. 6 &gt; 5. Backslash: \\ Backtick: \` Asterisk: \* Underscore: \_ Left brace: { Right brace: } Left bracket: \[ Right bracket: \ -License: UNKNOWN - FIXME - Files: tests/docx/table_with_list_cell.docx.metadata_dump Copyright: : 2007, Apple Inc. License: UNKNOWN @@ -545,21 +535,13 @@ Copyright: </Content> License: UNKNOWN FIXME -Files: tests/writer.fb2 -Copyright: </p><p>AT&T has an ampersand in their name.</p><p>AT&T is another way to write it.</p><p>This & that.</p><p>4 < 5.</p><p>6 > 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 FIXME Files: README -Copyright: 2006-2015, John MacFarlane (jgm@berkeley.edu). Released under the - 2007, Joe Smith - 2007, John Smith, CC BY-NC - for full and warranty notices.) +Copyright: 2007, Joe Smith License: UNKNOWN FIXME @@ -572,8 +554,6 @@ Files: changelog Copyright: 2007, John Smith, CC BY-NC file files for `pandoc`, `pandoc-citeproc` - message in Main.hs - message to '-v' output, modeled after FSF messages sign ) License: UNKNOWN FIXME @@ -583,22 +563,11 @@ Copyright: Peter Jipsen http://www.chapman.edu/~jipsen License: UNKNOWN FIXME -Files: man/man1/pandoc.1 -Copyright: 2006\-2015, John MacFarlane (jgm@berkeley.edu) - for full and warranty notices.) -License: UNKNOWN - FIXME - Files: tests/writer.rtf Copyright: \u169?\sa180\par} License: UNKNOWN FIXME -Files: src/Text/Pandoc/Readers/DocBook.hs -Copyright: - information about a document -License: UNKNOWN - FIXME - Files: COPYRIGHT Copyright: 1994–2015, Lua.org, PUC-Rio 2004, Peter Jipsen http://www.chapman.edu/~jipsen @@ -609,6 +578,7 @@ Copyright: 1994–2015, Lua.org, PUC-Rio 2010-2015, Paul Rivier and John MacFarlane 2010-2015, Puneeth Chaganti and John MacFarlane 2014-2015, Albert Krewinkel + and license License: WTFPL MIT/X11 (BSD like) GPL-2+ FIXME |