Merge branch 'master' into experimental

what a mess

4 files changed, 60 insertions, 6 deletions

diff --git a/p/haskell-dns/debian/changelog b/p/haskell-dns/debian/changelog
index 3c8fcf49a..dc07d252c 100644
--- a/p/haskell-dns/debian/changelog
+++ b/p/haskell-dns/debian/changelog
@@ -1,8 +1,26 @@
-haskell-dns (2.0.2-2) UNRELEASED; urgency=medium
+haskell-dns (2.0.6-1) unstable; urgency=medium
 
-  * Fix VCS fields
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Mon, 10 Oct 2016 00:42:34 -0400
+
+haskell-dns (2.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 25 Aug 2016 22:27:52 -0400
+
+haskell-dns (2.0.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 04 Aug 2016 13:20:23 -0400
+
+haskell-dns (2.0.3-1) unstable; urgency=medium
+
+  * New upstream release
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 02 Jun 2016 19:12:27 +0200
+ -- Clint Adams <clint@debian.org>  Tue, 12 Jul 2016 16:39:15 -0400
 
 haskell-dns (2.0.2-1) unstable; urgency=medium
 
diff --git a/p/haskell-dns/debian/control b/p/haskell-dns/debian/control
index 0b7089f21..34d1b4083 100644
--- a/p/haskell-dns/debian/control
+++ b/p/haskell-dns/debian/control
@@ -10,8 +10,6 @@ Build-Depends: debhelper (>= 9),
  ghc-prof,
  libghc-attoparsec-dev,
  libghc-attoparsec-prof,
- libghc-blaze-builder-dev,
- libghc-blaze-builder-prof,
  libghc-conduit-dev (>= 1.1),
  libghc-conduit-prof,
  libghc-conduit-extra-dev (>= 1.1),
@@ -26,9 +24,11 @@ Build-Depends: debhelper (>= 9),
  libghc-random-prof,
  libghc-resourcet-dev,
  libghc-resourcet-prof,
+ libghc-safe-dev (>= 0.3),
+ libghc-safe-dev (<< 0.4),
+ libghc-safe-prof,
 Build-Depends-Indep: ghc-doc,
  libghc-attoparsec-doc,
- libghc-blaze-builder-doc,
  libghc-conduit-doc,
  libghc-conduit-extra-doc,
  libghc-iproute-doc,
@@ -36,6 +36,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-network-doc,
  libghc-random-doc,
  libghc-resourcet-doc,
+ libghc-safe-doc,
 Standards-Version: 3.9.8
 Homepage: http://hackage.haskell.org/package/dns
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
diff --git a/p/haskell-dns/debian/patches/no-bytestring-builder b/p/haskell-dns/debian/patches/no-bytestring-builder
new file mode 100644
index 000000000..be83398a7
--- /dev/null
+++ b/p/haskell-dns/debian/patches/no-bytestring-builder
@@ -0,0 +1,34 @@
+--- a/dns.cabal
++++ b/dns.cabal
+@@ -30,7 +30,6 @@
+                       , attoparsec
+                       , binary
+                       , bytestring
+-                      , bytestring-builder
+                       , conduit >= 1.1
+                       , conduit-extra >= 1.1
+                       , containers
+@@ -45,7 +44,6 @@
+                       , attoparsec
+                       , binary
+                       , bytestring
+-                      , bytestring-builder
+                       , conduit >= 1.1
+                       , conduit-extra >= 1.1
+                       , containers
+@@ -67,7 +65,6 @@
+   Build-Depends:        dns
+                       , base
+                       , bytestring
+-                      , bytestring-builder
+                       , hspec
+ 
+ Test-Suite spec
+@@ -82,7 +79,6 @@
+                       , attoparsec
+                       , binary
+                       , bytestring
+-                      , bytestring-builder
+                       , conduit >= 1.1
+                       , conduit-extra >= 1.1
+                       , containers
diff --git a/p/haskell-dns/debian/patches/series b/p/haskell-dns/debian/patches/series
new file mode 100644
index 000000000..d61cbb2d4
--- /dev/null
+++ b/p/haskell-dns/debian/patches/series
@@ -0,0 +1 @@
+no-bytestring-builder