haskell-hakyll: New upstream version 4.4.3.0.

5 files changed, 16 insertions, 48 deletions

diff --git a/p/haskell-hakyll/debian/changelog b/p/haskell-hakyll/debian/changelog
index 3ac09ec8b..4cc5ca81f 100644
--- a/p/haskell-hakyll/debian/changelog
+++ b/p/haskell-hakyll/debian/changelog
@@ -1,9 +1,12 @@
-haskell-hakyll (4.4.1.2-1) UNRELEASED; urgency=low
+haskell-hakyll (4.4.3.0-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
+
+  [ Clint Adams ]
   * New upstream release
 
- -- Joachim Breitner <nomeata@debian.org>  Sun, 24 Nov 2013 18:26:13 +0000
+ -- Clint Adams <clint@debian.org>  Fri, 03 Jan 2014 14:40:23 -0500
 
 haskell-hakyll (4.3.3.0-1) unstable; urgency=low
 
diff --git a/p/haskell-hakyll/debian/control b/p/haskell-hakyll/debian/control
index 4c9353cd2..2eb7ecf84 100644
--- a/p/haskell-hakyll/debian/control
+++ b/p/haskell-hakyll/debian/control
@@ -9,19 +9,19 @@ Build-Depends: debhelper (>= 9)
   , haskell-devscripts (>= 0.8.19)
   , ghc
   , ghc-prof
-  , libghc-blaze-html-dev (>> 0.5)
+  , libghc-blaze-html-dev (>= 0.5)
   , libghc-blaze-html-dev (<< 0.7)
   , libghc-blaze-html-prof
-  , libghc-blaze-markup-dev (>> 0.5.1)
+  , libghc-blaze-markup-dev (>= 0.5.1)
   , libghc-blaze-markup-dev (<< 0.6)
   , libghc-blaze-markup-prof
   , libghc-cmdargs-dev (>= 0.10)
   , libghc-cmdargs-dev (<< 1.11)
   , libghc-cmdargs-prof
-  , libghc-cryptohash-dev (>> 0.7)
+  , libghc-cryptohash-dev (>= 0.7)
   , libghc-cryptohash-dev (<< 0.12)
   , libghc-cryptohash-prof
-  , libghc-data-default-dev (>> 0.4)
+  , libghc-data-default-dev (>= 0.4)
   , libghc-data-default-dev (<< 0.6)
   , libghc-data-default-prof
   , libghc-lrucache-dev (>= 1.1.1)
@@ -30,14 +30,14 @@ Build-Depends: debhelper (>= 9)
   , libghc-mtl-dev (>= 1)
   , libghc-mtl-dev (<< 2.2)
   , libghc-mtl-prof
-  , libghc-network-dev (>> 2.4)
+  , libghc-network-dev (>= 2.4)
   , libghc-network-dev (<< 2.5)
   , libghc-network-prof
   , libghc-pandoc-dev (>= 1.12)
   , libghc-pandoc-dev (<< 1.13)
   , libghc-pandoc-prof
-  , libghc-pandoc-citeproc-dev (>= 0.1)
-  , libghc-pandoc-citeproc-dev (<< 0.2)
+  , libghc-pandoc-citeproc-dev (>= 0.2)
+  , libghc-pandoc-citeproc-dev (<< 0.3)
   , libghc-pandoc-citeproc-prof
   , libghc-parsec3-dev (>= 3.0)
   , libghc-parsec3-dev (<< 3.2)
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 9)
   , libghc-tagsoup-dev (<< 0.14)
   , libghc-tagsoup-prof
   , libghc-text-dev (>= 0.11)
-  , libghc-text-dev (<< 1.12)
+  , libghc-text-dev (<< 1.1)
   , libghc-text-prof
   , libghc-snap-core-dev (>= 0.6)
   , libghc-snap-core-dev (<< 0.10)
@@ -67,9 +67,9 @@ Build-Depends: debhelper (>= 9)
   , libghc-fsnotify-dev (<< 0.1)
   , libghc-fsnotify-prof
   , libghc-system-filepath-dev (>= 0.4.6)
-  , libghc-system-filepath-dev (<< 0.5)
+  , libghc-system-filepath-dev (<< 0.5.1)
   , libghc-http-conduit-dev (>= 1.8)
-  , libghc-http-conduit-dev (<< 1.10)
+  , libghc-http-conduit-dev (<< 2.1)
   , libghc-http-conduit-prof
   , libghc-http-types-dev (>= 0.7)
   , libghc-http-types-dev (<< 0.9)
@@ -105,7 +105,7 @@ Build-Depends-Indep: ghc-doc
   , libghc-text-doc
   , libghc-snap-core-doc
   , libghc-snap-server-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/hakyll
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-hakyll
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hakyll
diff --git a/p/haskell-hakyll/debian/patches/newer-cryptohash.diff b/p/haskell-hakyll/debian/patches/newer-cryptohash.diff
deleted file mode 100644
index 18bc08fb5..000000000
--- a/p/haskell-hakyll/debian/patches/newer-cryptohash.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hakyll.cabal
-+++ b/hakyll.cabal
-@@ -145,7 +145,7 @@
-     citeproc-hs  >= 0.3.2  && < 0.4,
-     cmdargs      >= 0.10   && < 0.11,
-     containers   >= 0.3    && < 0.6,
--    cryptohash   >= 0.7    && < 0.10,
-+    cryptohash   >= 0.7    && < 0.11,
-     data-default >= 0.4    && < 0.6,
-     deepseq      >= 1.3    && < 1.4,
-     directory    >= 1.0    && < 1.3,
-@@ -222,7 +222,7 @@
-     citeproc-hs  >= 0.3.2  && < 0.4,
-     cmdargs      >= 0.10   && < 0.11,
-     containers   >= 0.3    && < 0.6,
--    cryptohash   >= 0.7    && < 0.10,
-+    cryptohash   >= 0.7    && < 0.11,
-     data-default >= 0.4    && < 0.6,
-     deepseq      >= 1.3    && < 1.4,
-     directory    >= 1.0    && < 1.3,
diff --git a/p/haskell-hakyll/debian/patches/quickcheck-2.6-compat.patch b/p/haskell-hakyll/debian/patches/quickcheck-2.6-compat.patch
deleted file mode 100644
index 6332bdeaa..000000000
--- a/p/haskell-hakyll/debian/patches/quickcheck-2.6-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haskell-hakyll-4.3.3.0/hakyll.cabal
-===================================================================
---- haskell-hakyll-4.3.3.0.orig/hakyll.cabal	2013-09-18 19:51:07.605425913 +0200
-+++ haskell-hakyll-4.3.3.0/hakyll.cabal	2013-09-18 19:51:07.561425915 +0200
-@@ -209,7 +209,7 @@
-
-   Build-Depends:
-     HUnit                      >= 1.2 && < 1.3,
--    QuickCheck                 >= 2.4 && < 2.6,
-+    QuickCheck                 >= 2.4 && < 2.7,
-     test-framework             >= 0.4 && < 0.9,
-     test-framework-hunit       >= 0.2 && < 0.4,
-     test-framework-quickcheck2 >= 0.2 && < 0.4,
diff --git a/p/haskell-hakyll/debian/patches/series b/p/haskell-hakyll/debian/patches/series
deleted file mode 100644
index 04fcca602..000000000
--- a/p/haskell-hakyll/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-quickcheck-2.6-compat.patch
-newer-cryptohash.diff