summaryrefslogtreecommitdiff
path: root/p/haskell-conduit
diff options
context:
space:
mode:
authorClint Adams <clint@debian.org>2016-10-12 18:53:42 -0400
committerClint Adams <clint@debian.org>2016-10-12 18:53:42 -0400
commit160c84c1046cc804e786663ae34b12a0b108e567 (patch)
treebf2ddb453cd2eb41edb735828a34ac87c04d72af /p/haskell-conduit
parente7d091a0222b0dbc897436def874f092d4874f47 (diff)
parent82ce455936337280b4fddaf8fbc7bed0d015167d (diff)
downloadDHG_packages-160c84c1046cc804e786663ae34b12a0b108e567.tar.gz
Merge branch 'master' into experimental
what a mess
Diffstat (limited to 'p/haskell-conduit')
-rw-r--r--p/haskell-conduit/debian/changelog12
-rw-r--r--p/haskell-conduit/debian/control3
2 files changed, 12 insertions, 3 deletions
diff --git a/p/haskell-conduit/debian/changelog b/p/haskell-conduit/debian/changelog
index a2b5b26b8..0745c853c 100644
--- a/p/haskell-conduit/debian/changelog
+++ b/p/haskell-conduit/debian/changelog
@@ -1,8 +1,14 @@
-haskell-conduit (1.2.6.6-2) UNRELEASED; urgency=medium
+haskell-conduit (1.2.8-1) unstable; urgency=medium
- * Fix VCS fields
+ * New upstream release
+
+ -- Clint Adams <clint@debian.org> Thu, 29 Sep 2016 11:05:32 -0400
+
+haskell-conduit (1.2.7-1) unstable; urgency=medium
+
+ * New upstream release
- -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 02 Jun 2016 19:12:20 +0200
+ -- Sean Whitton <spwhitton@spwhitton.name> Fri, 12 Aug 2016 21:28:44 -0700
haskell-conduit (1.2.6.6-1) unstable; urgency=medium
diff --git a/p/haskell-conduit/debian/control b/p/haskell-conduit/debian/control
index 6c266d5f3..7db8af9e9 100644
--- a/p/haskell-conduit/debian/control
+++ b/p/haskell-conduit/debian/control
@@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 9),
libghc-lifted-base-prof,
libghc-mmorph-dev,
libghc-mmorph-prof,
+ libghc-monad-control-dev,
+ libghc-monad-control-prof,
libghc-mtl-dev,
libghc-mtl-prof,
libghc-resourcet-dev (>= 1.1),
@@ -33,6 +35,7 @@ Build-Depends-Indep: ghc-doc,
libghc-exceptions-doc,
libghc-lifted-base-doc,
libghc-mmorph-doc,
+ libghc-monad-control-doc,
libghc-mtl-doc,
libghc-resourcet-doc,
libghc-transformers-base-doc,