summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-08-17 13:53:49 +0200
committerJonas Smedegaard <dr@jones.dk>2015-08-17 13:59:44 +0200
commit664bd37f9cacf183c34d7de552aa7e39db5cce55 (patch)
treebf1b9bfa5d513982f13b159b64e2e20387a01676
parent64efe4b56a7351da794f31f076eae1d891cd10f7 (diff)
Update changelog, control file and copyright hints.
-rw-r--r--debian/changelog7
-rw-r--r--debian/control14
-rw-r--r--debian/copyright_hints29
3 files changed, 30 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 7dc552b88..fd32c6e41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pandoc (1.14.0.4~dfsg-1) UNRELEASED; urgency=medium
+pandoc (1.15.0.6~dfsg-1) UNRELEASED; urgency=medium
[ upstream ]
* New release(s).
@@ -16,6 +16,11 @@ pandoc (1.14.0.4~dfsg-1) UNRELEASED; urgency=medium
+ Tighten GHC versioning for texmath highlighting-kate.
+ Relax GHC versioning for zlib quickcheck2 aeson hslua syb.
+ Add GHC relations for css-text filemanip cmark.
+ + Drop GHC relations for css-text.
+ + Fix add GHC relations for vector.
+ + Relax GHC upper bounds for haddock-library cmark.
+ * Update Homepage.
+ * Unfuzz patches.
-- Jonas Smedegaard <dr@jones.dk> Thu, 28 May 2015 16:52:50 +0200
diff --git a/debian/control b/debian/control
index 7744c8697..03618c5be 100644
--- a/debian/control
+++ b/debian/control
@@ -46,19 +46,19 @@ Build-Depends: cdbs,
libghc-blaze-html-dev (>= 0.5),
libghc-blaze-html-dev (<< 0.9),
libghc-blaze-markup-dev (<< 0.8),
- libghc-css-text-dev (>= 0.1.2),
- libghc-css-text-dev (<< 0.3),
libghc-yaml-dev (>= 0.8.8.2),
libghc-yaml-dev (<< 0.9),
libghc-scientific-dev (<< 0.4),
+ libghc-vector-dev (>= 0.10),
+ libghc-vector-dev (<< 0.12),
libghc-hslua-dev (<< 0.5),
libghc-sha-dev (>= 1.6),
libghc-sha-dev (<< 1.7),
- libghc-haddock-library-dev (<< 1.2),
+ libghc-haddock-library-dev (<< 1.3),
libghc-deepseq-generics-dev (<< 0.2),
libghc-juicypixels-dev (<< 3.3),
libghc-filemanip-dev (<< 0.4),
- libghc-cmark-dev (<< 0.4),
+ libghc-cmark-dev (<< 0.5),
libghc-http-client-dev (<< 0.5),
libghc-http-client-tls-dev (<< 0.3),
libghc-http-types-dev (>= 0.8),
@@ -87,9 +87,9 @@ Build-Depends: cdbs,
libghc-temporary-prof,
libghc-blaze-html-prof,
libghc-blaze-markup-prof,
- libghc-css-text-prof,
libghc-yaml-prof,
libghc-scientific-prof,
+ libghc-vector-prof,
libghc-hslua-prof,
libghc-sha-prof,
libghc-haddock-library-prof,
@@ -125,9 +125,9 @@ Build-Depends-Indep: ghc-doc
, libghc-temporary-doc
, libghc-blaze-html-doc
, libghc-blaze-markup-doc
- , libghc-css-text-doc
, libghc-yaml-doc
, libghc-scientific-doc
+ , libghc-vector-doc
, libghc-hslua-doc
, libghc-sha-doc
, libghc-haddock-library-doc
@@ -148,7 +148,7 @@ Build-Depends-Indep: ghc-doc
, libghc-transformers-doc
, libghc-utf8-string-doc
Standards-Version: 3.9.6
-Homepage: http://johnmacfarlane.net/pandoc/
+Homepage: http://pandoc.org/
Vcs-Git: git://anonscm.debian.org/pkg-haskell/pandoc.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/pandoc.git
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 6c4cf7986..df33194a9 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,7 +7,6 @@ Disclaimer: Autogenerated by CDBS
Files: BUGS
CONTRIBUTING.md
INSTALL
- Makefile
data/docx/[Content_Types].xml
data/docx/_rels/.rels
data/docx/docProps/app.xml
@@ -82,9 +81,10 @@ Files: BUGS
debian/source/format
debian/source/lintian-overrides
debian/watch
- man/make-pandoc-man-pages.hs
- man/man1/pandoc.1.template
- man/man5/pandoc_markdown.5.template
+ man/capitalizeHeaders.hs
+ man/pandoc.1.template
+ man/removeLinks.hs
+ man/removeNotes.hs
src/Text/Pandoc/Compat/Directory.hs
src/Text/Pandoc/Compat/Except.hs
src/Text/Pandoc/Compat/Locale.hs
@@ -510,11 +510,6 @@ Copyright: 1989, 1991 Free Software Foundation, Inc
License: GPL-ever
FIXME
-Files: tests/textile-reader.textile
-Copyright: 2008
-License: UNKNOWN
- FIXME
-
Files: tests/docx/table_with_list_cell.docx.metadata_dump
Copyright: : 2007, Apple Inc.
License: UNKNOWN
@@ -526,7 +521,7 @@ License: UNKNOWN
FIXME
Files: src/Text/Pandoc/Writers/ICML.hs
-Copyright: : 2013, github.com/mb21
+Copyright: : 2013, github.com/mb21 License : GNU GPL, version 2 or above
License: UNKNOWN
FIXME
@@ -559,7 +554,12 @@ License: UNKNOWN
FIXME
Files: data/MathMLinHTML.js
-Copyright: Peter Jipsen http://www.chapman.edu/~jipsen
+Copyright: Peter Jipsen http:www.chapman.edu/~jipsen
+License: UNKNOWN
+ FIXME
+
+Files: man/pandoc.1
+Copyright: 2006\-2015, John MacFarlane (jgm@berkeley.edu)
License: UNKNOWN
FIXME
@@ -568,9 +568,14 @@ Copyright: \u169?\sa180\par}
License: UNKNOWN
FIXME
+Files: tests/textile-reader.textile
+Copyright: 2008, h1. Footnotes
+License: UNKNOWN
+ FIXME
+
Files: COPYRIGHT
Copyright: 1994–2015, Lua.org, PUC-Rio
- 2004, Peter Jipsen http://www.chapman.edu/~jipsen
+ 2004, Peter Jipsen http:www.chapman.edu/~jipsen
2005, Peter Jipsen
2006-2015, John MacFarlane <jgm at berkeley dot edu>
2008-2015, Andrea Rossato and John MacFarlane