[Pkg-haskell-commits] darcs: haskell-markdown: staging conduit 1.1 transition

[Clint Adams]

Tue Jun 10 13:54:38 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition

    M ./changelog +6
    M ./control -11 +11
    A ./patches/
    A ./patches/no-attoparsec-conduit.diff
    A ./patches/series

Tue Jun 10 13:54:38 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-markdown/changelog new-haskell-markdown/changelog
--- old-haskell-markdown/changelog	2014-06-10 13:57:28.533845298 +0000
+++ new-haskell-markdown/changelog	2014-06-10 13:57:28.533845298 +0000
@@ -1,3 +1,9 @@
+haskell-markdown (0.1.8-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Fri, 06 Jun 2014 23:48:10 -0400
+
 haskell-markdown (0.1.7-1) unstable; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-haskell-markdown/control new-haskell-markdown/control
--- old-haskell-markdown/control	2014-06-10 13:57:28.533845298 +0000
+++ new-haskell-markdown/control	2014-06-10 13:57:28.533845298 +0000
@@ -8,35 +8,35 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-attoparsec-dev (>> 0.10)
+  , libghc-attoparsec-dev (>= 0.10)
   , libghc-attoparsec-prof
-  , libghc-attoparsec-conduit-dev (>> 0.5)
-  , libghc-attoparsec-conduit-prof
-  , libghc-blaze-html-dev (>> 0.4)
+  , libghc-blaze-html-dev (>= 0.4)
   , libghc-blaze-html-prof
-  , libghc-conduit-dev (>> 0.5.2.1)
+  , libghc-conduit-dev (>= 0.5.2.1)
   , libghc-conduit-prof
-  , libghc-data-default-dev (>> 0.3)
+  , libghc-conduit-extra-dev
+  , libghc-conduit-extra-prof
+  , libghc-data-default-dev (>= 0.3)
   , libghc-data-default-prof
   , libghc-text-dev
   , libghc-text-prof
-  , libghc-transformers-dev (>> 0.2.2)
+  , libghc-transformers-dev (>= 0.2.2)
   , libghc-transformers-prof
-  , libghc-xss-sanitize-dev (>> 0.3.3)
+  , libghc-xss-sanitize-dev (>= 0.3.3)
   , libghc-xss-sanitize-prof
-  , libghc-hspec-dev (>> 1.3)
+  , libghc-hspec-dev (>= 1.3)
   , libghc-system-fileio-dev
   , libghc-system-filepath-dev
 Build-Depends-Indep: ghc-doc
   , libghc-attoparsec-doc
-  , libghc-attoparsec-conduit-doc
   , libghc-blaze-html-doc
   , libghc-conduit-doc
+  , libghc-conduit-extra-doc
   , libghc-data-default-doc
   , libghc-text-doc
   , libghc-transformers-doc
   , libghc-xss-sanitize-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/markdown
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-markdown
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-markdown
diff -rN -u old-haskell-markdown/patches/no-attoparsec-conduit.diff new-haskell-markdown/patches/no-attoparsec-conduit.diff
--- old-haskell-markdown/patches/no-attoparsec-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-markdown/patches/no-attoparsec-conduit.diff	2014-06-10 13:57:28.537845296 +0000
@@ -0,0 +1,10 @@
+--- a/markdown.cabal
++++ b/markdown.cabal
+@@ -23,7 +23,6 @@
+   Build-depends:       base                   >= 4       && < 5
+                      , blaze-html             >= 0.4
+                      , attoparsec             >= 0.10
+-                     , attoparsec-conduit     >= 0.5
+                      , transformers           >= 0.2.2
+                      , conduit                >= 0.5.2.1
+                      , conduit-extra
diff -rN -u old-haskell-markdown/patches/series new-haskell-markdown/patches/series
--- old-haskell-markdown/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-markdown/patches/series	2014-06-10 13:57:28.537845296 +0000
@@ -0,0 +1 @@
+no-attoparsec-conduit.diff