[Pkg-haskell-commits] darcs: haskell-hakyll: New upstream version 3.2.0.9.

clint at debian.org clint at debian.org
Sat Oct 8 14:38:49 UTC 2011 

Sat Oct  8 14:38:37 UTC 2011  clint at debian.org
  * New upstream version 3.2.0.9.
  Ignore-this: d2cb1024a2dd787174918b96bdbef86f

    M ./changelog +8
    M ./control -5 +6
    R ./patches/
    R ./patches/0001-Use-cryptohash-instead-of-hopenssl.patch
    R ./patches/series
    R ./yesod.dirs

Sat Oct  8 14:38:37 UTC 2011  clint at debian.org
  * New upstream version 3.2.0.9.
  Ignore-this: d2cb1024a2dd787174918b96bdbef86f
diff -rN -u old-haskell-hakyll//changelog new-haskell-hakyll//changelog
--- old-haskell-hakyll//changelog	2011-10-08 14:38:48.899828345 +0000
+++ new-haskell-hakyll//changelog	2011-10-08 14:38:48.903829090 +0000
@@ -1,3 +1,11 @@
+haskell-hakyll (3.2.0.9-1) unstable; urgency=low
+
+  * New upstream version.
+    - Build-depends on newer hamlet.  closes: #640963.
+    - Drop 0001-Use-cryptohash-instead-of-hopenssl.patch (merged upstream).
+
+ -- Clint Adams <clint at debian.org>  Sat, 08 Oct 2011 10:11:12 -0400
+
 haskell-hakyll (3.2.0.5-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-hakyll//control new-haskell-hakyll//control
--- old-haskell-hakyll//control	2011-10-08 14:38:48.899828345 +0000
+++ new-haskell-hakyll//control	2011-10-08 14:38:48.903829090 +0000
@@ -1,7 +1,8 @@
 Source: haskell-hakyll
 Section: haskell
 Priority: extra
-Maintainer: Clint Adams <clint at debian.org>
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Clint Adams <clint at debian.org>
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.8)
@@ -13,8 +14,8 @@
   , libghc-cryptohash-dev (>> 0.7)
   , libghc-cryptohash-dev (<< 0.8)
   , libghc-cryptohash-prof
-  , libghc-hamlet-dev (>> 0.7)
-  , libghc-hamlet-dev (<< 0.9)
+  , libghc-hamlet-dev (>> 0.10.3)
+  , libghc-hamlet-dev (<< 0.11)
   , libghc-hamlet-prof
   , libghc-mtl-dev (>> 1)
   , libghc-mtl-dev (<< 3)
@@ -46,8 +47,8 @@
   , libghc-tagsoup-doc
 Standards-Version: 3.9.2
 Homepage: http://hackage.haskell.org/package/hakyll
-Vcs-Git: git://git.debian.org/collab-maint/haskell-hakyll.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/haskell-hakyll.git;a=summary
+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
 
 Package: libghc-hakyll-dev
 Architecture: any
diff -rN -u old-haskell-hakyll//patches/0001-Use-cryptohash-instead-of-hopenssl.patch new-haskell-hakyll//patches/0001-Use-cryptohash-instead-of-hopenssl.patch
--- old-haskell-hakyll//patches/0001-Use-cryptohash-instead-of-hopenssl.patch	2011-10-08 14:38:48.899828345 +0000
+++ new-haskell-hakyll//patches/0001-Use-cryptohash-instead-of-hopenssl.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-From de01fdf9dd0144adbdcce8759e98c50e61e6055d Mon Sep 17 00:00:00 2001
-From: Jasper Van der Jeugt <m at jaspervdj.be>
-Date: Sat, 27 Aug 2011 12:16:03 +0200
-Subject: [PATCH 1/2] Use cryptohash instead of hopenssl
-
----
- hakyll.cabal                         |    2 +-
- src/Hakyll/Core/Resource/Provider.hs |   10 ++++------
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/hakyll.cabal b/hakyll.cabal
-index 9b0c245..52ef48f 100644
---- a/hakyll.cabal
-+++ b/hakyll.cabal
-@@ -64,10 +64,10 @@ Library
-     blaze-html  >= 0.4   && < 0.6,
-     bytestring  >= 0.9   && < 1.0,
-     containers  >= 0.3   && < 1.0,
-+    cryptohash  >= 0.7   && < 0.8,
-     directory   >= 1.0   && < 1.3,
-     filepath    >= 1.0   && < 2.0,
-     hamlet      >= 0.7   && < 0.9,
--    hopenssl    >= 1.4   && < 1.7,
-     mtl         >= 1     && < 3.0,
-     old-locale  >= 1.0   && < 2.0,
-     old-time    >= 1.0   && < 1.3,
-diff --git a/src/Hakyll/Core/Resource/Provider.hs b/src/Hakyll/Core/Resource/Provider.hs
-index 16b9220..808719a 100644
---- a/src/Hakyll/Core/Resource/Provider.hs
-+++ b/src/Hakyll/Core/Resource/Provider.hs
-@@ -20,14 +20,12 @@ module Hakyll.Core.Resource.Provider
- 
- import Control.Applicative ((<$>))
- import Control.Concurrent (MVar, readMVar, modifyMVar_, newMVar)
--import Control.Monad ((<=<))
--import Data.Word (Word8)
- import Data.Map (Map)
- import qualified Data.Map as M
- 
-+import qualified Crypto.Hash.MD5 as MD5
-+import qualified Data.ByteString as B
- import qualified Data.ByteString.Lazy as LB
--import OpenSSL.Digest.ByteString.Lazy (digest)
--import OpenSSL.Digest (MessageDigest (MD5))
- 
- import Hakyll.Core.Store
- import Hakyll.Core.Resource
-@@ -60,8 +58,8 @@ resourceExists provider = flip elem $ resourceList provider
- 
- -- | Retrieve a digest for a given resource
- --
--resourceDigest :: ResourceProvider -> Resource -> IO [Word8]
--resourceDigest provider = digest MD5 <=< resourceLBS provider
-+resourceDigest :: ResourceProvider -> Resource -> IO B.ByteString
-+resourceDigest provider = fmap MD5.hashlazy . resourceLBS provider
- 
- -- | Check if a resource was modified
- --
--- 
-1.7.5.4
-
diff -rN -u old-haskell-hakyll//patches/series new-haskell-hakyll//patches/series
--- old-haskell-hakyll//patches/series	2011-10-08 14:38:48.899828345 +0000
+++ new-haskell-hakyll//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-0001-Use-cryptohash-instead-of-hopenssl.patch
diff -rN -u old-haskell-hakyll//yesod.dirs new-haskell-hakyll//yesod.dirs
--- old-haskell-hakyll//yesod.dirs	2011-10-08 14:38:48.875829698 +0000
+++ new-haskell-hakyll//yesod.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/bin
-usr/share

More information about the Pkg-haskell-commits mailing list