[Pkg-haskell-commits] darcs: haskell-hakyll: Initial Check-In
clint at debian.org
clint at debian.org
Tue Sep 6 01:38:28 UTC 2011
Tue Sep 6 01:36:14 UTC 2011 clint at debian.org
* Initial Check-In
Ignore-this: d0e797feb05d66af046a2b870e06c196
A ./changelog
A ./compat
A ./control
A ./copyright
A ./patches/
A ./patches/0001-Use-cryptohash-instead-of-hopenssl.patch
A ./patches/series
A ./rules
A ./source/
A ./source/format
A ./watch
A ./yesod.dirs
Tue Sep 6 01:36:14 UTC 2011 clint at debian.org
* Initial Check-In
Ignore-this: d0e797feb05d66af046a2b870e06c196
diff -rN -u old-haskell-hakyll//changelog new-haskell-hakyll//changelog
--- old-haskell-hakyll//changelog 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//changelog 2011-09-06 01:38:28.634053797 +0000
@@ -0,0 +1,5 @@
+haskell-hakyll (3.2.0.5-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Clint Adams <clint at debian.org> Mon, 05 Sep 2011 19:34:33 -0400
diff -rN -u old-haskell-hakyll//compat new-haskell-hakyll//compat
--- old-haskell-hakyll//compat 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//compat 2011-09-06 01:38:28.634053797 +0000
@@ -0,0 +1 @@
+7
diff -rN -u old-haskell-hakyll//control new-haskell-hakyll//control
--- old-haskell-hakyll//control 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//control 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1,106 @@
+Source: haskell-hakyll
+Section: haskell
+Priority: extra
+Maintainer: Clint Adams <clint at debian.org>
+Build-Depends: debhelper (>= 7)
+ , cdbs
+ , haskell-devscripts (>= 0.8)
+ , ghc
+ , ghc-prof
+ , libghc-binary-dev (>> 0.5)
+ , libghc-binary-dev (<< 1.0)
+ , libghc-binary-prof
+ , 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-prof
+ , libghc-mtl-dev (>> 1)
+ , libghc-mtl-dev (<< 3)
+ , libghc-mtl-prof
+ , libghc-pandoc-dev (>> 1.6)
+ , libghc-pandoc-dev (<< 2.0)
+ , libghc-pandoc-prof
+ , libghc-parsec3-dev (>> 2.1)
+ , libghc-parsec3-dev (<< 3.2)
+ , libghc-parsec3-prof
+ , libghc-regex-base-dev (>> 0.93)
+ , libghc-regex-base-dev (<< 1.0)
+ , libghc-regex-base-prof
+ , libghc-regex-pcre-dev (>> 0.93)
+ , libghc-regex-pcre-dev (<< 1.0)
+ , libghc-regex-pcre-prof
+ , libghc-tagsoup-dev (>> 0.12)
+ , libghc-tagsoup-dev (<< 0.13)
+ , libghc-tagsoup-prof
+Build-Depends-Indep: ghc-doc
+ , libghc-binary-doc
+ , libghc-cryptohash-doc
+ , libghc-hamlet-doc
+ , libghc-mtl-doc
+ , libghc-pandoc-doc
+ , libghc-parsec3-doc
+ , libghc-regex-base-doc
+ , libghc-regex-pcre-doc
+ , 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
+
+Package: libghc-hakyll-dev
+Architecture: any
+Depends: ${haskell:Depends}
+ , ${shlibs:Depends}
+ , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: static website compiler library
+ This package provides a library for the Haskell programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ Hakyll is a static website compiler library. It provides you with
+ the tools to create a simple or advanced static website using a
+ Haskell DSL and formats such as markdown or RST. You can find
+ more information, including a tutorial, on the website:
+ .
+ http://jaspervdj.be/hakyll
+
+Package: libghc-hakyll-prof
+Architecture: any
+Depends: ${haskell:Depends}
+ , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: static website compiler library; profiling libraries
+ This package provides a library for the Haskell programming language,
+ compiled for profiling.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ Hakyll is a static website compiler library. It provides you with
+ the tools to create a simple or advanced static website using a
+ Haskell DSL and formats such as markdown or RST. You can find
+ more information, including a tutorial, on the website:
+ .
+ http://jaspervdj.be/hakyll
+
+Package: libghc-hakyll-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${haskell:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Description: static website compiler library; documentation
+ This package provides the documentation for a library for the Haskell
+ programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
+ Hakyll is a static website compiler library. It provides you with
+ the tools to create a simple or advanced static website using a
+ Haskell DSL and formats such as markdown or RST. You can find
+ more information, including a tutorial, on the website:
+ .
+ http://jaspervdj.be/hakyll
diff -rN -u old-haskell-hakyll//copyright new-haskell-hakyll//copyright
--- old-haskell-hakyll//copyright 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//copyright 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1,43 @@
+This package was debianized by Clint Adams <clint at debian.org> on
+Mon, 05 Sep 2011 23:34:33 -0000
+
+It was downloaded from
+http://hackage.haskell.org/package/hakyll
+
+Upstream Author:
+
+ Jasper Van der Jeugt <m at jaspervdj.be>
+
+Copyright:
+
+ 2009 Jasper Van der Jeugt
+
+License:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ * Neither the name of Jasper Van der Jeugt nor the names of other
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//patches/0001-Use-cryptohash-instead-of-hopenssl.patch 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1,61 @@
+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 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//patches/series 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1 @@
+0001-Use-cryptohash-instead-of-hopenssl.patch
diff -rN -u old-haskell-hakyll//rules new-haskell-hakyll//rules
--- old-haskell-hakyll//rules 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//rules 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
diff -rN -u old-haskell-hakyll//source/format new-haskell-hakyll//source/format
--- old-haskell-hakyll//source/format 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//source/format 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -rN -u old-haskell-hakyll//watch new-haskell-hakyll//watch
--- old-haskell-hakyll//watch 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//watch 2011-09-06 01:38:28.638054121 +0000
@@ -0,0 +1,5 @@
+version=3
+opts="downloadurlmangle=s|archive/([\w\d_-]+)/([\d\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\
+filenamemangle=s|(.*)/$|hakyll-$1.tar.gz|" \
+ http://hackage.haskell.org/packages/archive/hakyll \
+ ([\d\.]*\d)/
diff -rN -u old-haskell-hakyll//yesod.dirs new-haskell-hakyll//yesod.dirs
--- old-haskell-hakyll//yesod.dirs 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hakyll//yesod.dirs 2011-09-06 01:38:28.642056037 +0000
@@ -0,0 +1,2 @@
+usr/bin
+usr/share
More information about the Pkg-haskell-commits
mailing list