This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-core".
The branch, master has been updated
via 8fadfa4ac4117fa0c7eb343601a0230e06460739 (commit)
via d174f8fea7696cb57d6063ffbd452a54fa97b4a7 (commit)
via f866509a0df86b9e796394bac2d4e90b53243f8b (commit)
from 1eee1d0a0a3ff2d2a6a5587bafbcd4c99c4081e8 (commit)
Summary of changes:
snap-core.cabal | 2 +-
test/snap-core-testsuite.cabal | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8fadfa4ac4117fa0c7eb343601a0230e06460739
Merge: 1eee1d0 d174f8f
Author: Gregory Collins <[email protected]>
Date: Mon Oct 25 15:20:37 2010 +0200
Merge branch '0.2-stable'
Conflicts:
snap-core.cabal
diff --cc snap-core.cabal
index e501978,8220460..7d438e8
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@@ -156,10 -162,53 +156,10 @@@ Librar
monads-fd,
old-locale,
old-time,
- text >= 0.7.1 && <0.8,
+ text >= 0.10 && <0.11,
time,
transformers,
- unix-compat,
- zlib
-
- ghc-prof-options: -prof -auto-all
-
- if impl(ghc >= 6.12.0)
- ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
- -fno-warn-unused-do-bind
- else
- ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
-
-
-Executable snap
- hs-source-dirs: src
- main-is: Snap/Starter.hs
-
- other-modules: Snap.StarterTH
-
- if flag(no-debug)
- cpp-options: -DNODEBUG
-
- build-depends:
- attoparsec >= 0.8.1 && < 0.9,
- base >= 4 && < 5,
- bytestring,
- bytestring-nums,
- bytestring-show >= 0.3.2 && < 0.4,
- cereal >= 0.3 && < 0.4,
- containers,
- deepseq >= 1.1 && <1.2,
- directory,
- directory-tree,
- dlist >= 0.5 && < 0.6,
- filepath,
- haskell98,
- iteratee >= 0.3.1 && <0.4,
- monads-fd,
- old-locale,
- old-time,
- template-haskell,
- text >= 0.10 && <0.11,
- time,
- transformers,
- unix-compat,
+ unix-compat == 0.2.*,
zlib
ghc-prof-options: -prof -auto-all
diff --cc test/snap-core-testsuite.cabal
index 8c611aa,1ee04d5..884635d
--- a/test/snap-core-testsuite.cabal
+++ b/test/snap-core-testsuite.cabal
@@@ -45,10 -45,10 +45,10 @@@ Executable testsuit
test-framework >= 0.3.1 && <0.4,
test-framework-hunit >= 0.2.5 && < 0.3,
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
- text >= 0.7.1 && <0.8,
+ text >= 0.10 && <0.11,
time,
transformers,
- unix-compat,
+ unix-compat == 0.2.*,
zlib
ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
