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

3 files changed, 41 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index dcb5353db..78f2d53bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+pandoc (1.19.2.1.0-1) unstable; urgency=medium
+
+  [ upstream ]
+  * New release(s).
+    + Fixes lang-Variable collision between pandoc-citeproc and Babel.
+      Closes: Bug#870248. Thanks to Claus-Michael.
+
+  [ Jonas Smedegaard ]
+  * Update package relations:
+    + Add GHC for skylighting (replacing highlighting-kate).
+    + Relax GHC upper bounds for aeson blaze-html blaze-markup vector.
+  * Update copyright info: Extend coverage for main authors.
+  * Drop patch 2003 (relax GHC upper bounds for directory): Relaxed
+    upstream now.
+  * Unfuzz patches.
+  * Add patches cherry-picked upstream to use newer skylighting and
+    mention skylighting (not highlighting-kate) in manpage.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 01 Aug 2017 12:33:19 -0400
+
 pandoc (1.19.2.1~dfsg+really1.19.1-1) unstable; urgency=medium
 
   * Revert to upstream release 1.19.1: Avoid broken skylighting.
diff --git a/debian/control b/debian/control
index cf3cf1d40..615a43402 100644
--- a/debian/control
+++ b/debian/control
@@ -28,19 +28,19 @@ Build-Depends: cdbs,
  libghc-pandoc-types-dev (>= 1.17),
  libghc-pandoc-types-dev (<< 1.18),
  libghc-aeson-dev (>= 0.7.0.5),
- libghc-aeson-dev (<< 1.1),
+ libghc-aeson-dev (<< 1.2),
  libghc-tagsoup-dev (<< 0.15),
  libghc-base64-bytestring-dev (<< 1.1),
  libghc-zlib-dev (<< 0.7),
- libghc-highlighting-kate-dev (>= 0.6.2),
- libghc-highlighting-kate-dev (<< 0.7),
+ libghc-skylighting-dev (>= 0.3.3),
+ libghc-skylighting-dev (<< 0.4),
  libghc-data-default-dev (<< 0.8),
  libghc-temporary-dev (<< 1.3),
- libghc-blaze-html-dev (<< 0.9),
- libghc-blaze-markup-dev (<< 0.8),
+ libghc-blaze-html-dev (<< 0.10),
+ libghc-blaze-markup-dev (<< 0.9),
  libghc-yaml-dev (<< 0.9),
  libghc-scientific-dev (<< 0.4),
- libghc-vector-dev (<< 0.12),
+ libghc-vector-dev (<< 0.13),
  libghc-hslua-dev (<< 0.5),
  libghc-sha-dev (<< 1.7),
  libghc-haddock-library-dev (<< 1.5),
@@ -70,7 +70,7 @@ Build-Depends: cdbs,
  libghc-tagsoup-prof,
  libghc-base64-bytestring-prof,
  libghc-zlib-prof,
- libghc-highlighting-kate-prof,
+ libghc-skylighting-prof,
  libghc-data-default-prof,
  libghc-temporary-prof,
  libghc-blaze-html-prof,
@@ -108,7 +108,7 @@ Build-Depends-Indep: ghc-doc
   , libghc-tagsoup-doc
   , libghc-base64-bytestring-doc
   , libghc-zlib-doc
-  , libghc-highlighting-kate-doc
+  , libghc-skylighting-doc
   , libghc-data-default-doc
   , libghc-temporary-doc
   , libghc-blaze-html-doc
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c12071027..da3108fc5 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -77,9 +77,10 @@ Files: BUGS
  debian/pandoc.README.Debian
  debian/pandoc.install
  debian/pandoc.lintian-overrides
+ debian/patches/020170322~e30a257.patch
+ debian/patches/020170515~e01e2d0.patch
  debian/patches/1001_online_latexmathml_default.patch
  debian/patches/2001_avoid_missing_files.patch
- debian/patches/2003_bump_directory_bounds.patch
  debian/patches/README
  debian/patches/series
  debian/source/format
@@ -254,6 +255,8 @@ Files: BUGS
  tests/odt/native/referenceToText.native
  tests/odt/native/simpleTable.native
  tests/odt/native/simpleTableWithCaption.native
+ tests/odt/native/tableWithContents.native
+ tests/odt/native/textMixedStyles.native
  tests/odt/native/unicode.native
  tests/odt/native/unorderedList.native
  tests/opml-reader.native
@@ -430,6 +433,8 @@ Copyright: 2006-2015, John MacFarlane
   2014-2016, Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
   2014-2016, Jesse Rosenthal
   2014-2016, Jesse Rosenthal <jrosenthal@jhu.edu>
+  2014-2017, Albert Krewinkel
+  2014-2017, Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
   2015, John MacFarlane
   2015, John MacFarlane <jgm@berkeley.edu>
   2015, Martin Linnemann
@@ -475,8 +480,11 @@ License: UNKNOWN
 
 Files: Setup.hs
  benchmark/benchmark-pandoc.hs
+ data/LaTeXMathML.js
  src/Text/Pandoc/Writers/FB2.hs
-Copyright: 2006-2015, John MacFarlane <jgm@berkeley.edu>
+ tests/s5-fancy.html
+Copyright: 2005, Peter Jipsen http:www.chapman.edu/~jipsen.
+  2006-2015, John MacFarlane <jgm@berkeley.edu>
   2011-2012, Sergey Astanin
   2012-2014, John MacFarlane <jgm@berkeley.edu>
 License: GPL-2+
@@ -532,7 +540,7 @@ Copyright: 2006-2016, John MacFarlane (jgm@berkeley.edu).
   2007, John Smith, CC BY-NC
   for full copyright and warranty notices.)
   gory Bataille,
-  rémy
+  rémy Bobbio, Kelsey Hightower, Kolen Cheung, Konstantin Zudov,
 License: CC-BY-NC and/or GPL-2
  FIXME
 
@@ -540,7 +548,7 @@ Files: COPYRIGHT
 Copyright: 1994-2015, Lua.org, PUC-Rio.
   2004, Peter Jipsen http:www.chapman.edu/~jipsen
   2005, Peter Jipsen
-  2006-2016, John MacFarlane <jgm at berkeley dot edu>
+  2006-2017, John MacFarlane <jgm at berkeley dot edu>
   2008-2015, Andrea Rossato and John MacFarlane
   2008-2015, John MacFarlane and Peter Wang
   2010-2015, Paul Rivier and John MacFarlane
@@ -578,7 +586,7 @@ License: GPL-2
  FIXME
 
 Files: pandoc.cabal
-Copyright: (c) 2006-2016 John MacFarlane
+Copyright: (c) 2006-2017 John MacFarlane
   Extra-Source-Files:
 License: UNKNOWN
  FIXME