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".
The branch, master has been updated
via d39397538f979f34262bb86f44fef001d59e2063 (commit)
via 2b8274ea1df0e4c8179fce85d76f2d35c96de8a0 (commit)
via 17b43bf65c7c578831840d791c44e863377ef3a5 (commit)
from c19972cf469bc2d87650a04f565de4372222dcfd (commit)
Summary of changes:
project_template/barebones/foo.cabal | 17 ++++++-----------
project_template/default/foo.cabal | 2 +-
2 files changed, 7 insertions(+), 12 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 d39397538f979f34262bb86f44fef001d59e2063
Merge: 2b8274e c19972c
Author: Ozgun Ataman <[email protected]>
Date: Sat Dec 11 15:25:01 2010 -0500
Merge branch 'master' of git.snapframework.com:snap
Conflicts:
project_template/barebones/foo.cabal
commit 2b8274ea1df0e4c8179fce85d76f2d35c96de8a0
Author: Ozgun Ataman <[email protected]>
Date: Sat Dec 11 15:12:01 2010 -0500
Bump text version to 0.11 in default template
diff --git a/project_template/default/foo.cabal
b/project_template/default/foo.cabal
index 3747996..b3618ed 100644
--- a/project_template/default/foo.cabal
+++ b/project_template/default/foo.cabal
@@ -23,15 +23,15 @@ Executable projname
build-depends: hint >= 0.3.2 && < 0.4
Build-depends:
- MonadCatchIO-transformers >= 0.2.1 && < 0.3,
base >= 4 && < 5,
bytestring >= 0.9.1 && < 0.10,
heist >= 0.3 && < 0.4,
hexpat >= 0.19 && < 0.20,
+ MonadCatchIO-transformers >= 0.2.1 && < 0.3,
mtl >= 2 && < 3,
snap >= 0.3 && < 0.4,
snap-core >= 0.3 && < 0.4,
- text >= 0.10 && < 0.12,
+ text >= 0.11 && < 0.12,
time >= 1.1 && < 1.2
extensions: TypeSynonymInstances MultiParamTypeClasses
commit 17b43bf65c7c578831840d791c44e863377ef3a5
Author: Ozgun Ataman <[email protected]>
Date: Sat Dec 11 15:11:32 2010 -0500
Remove unused dependencies from barebones
diff --git a/project_template/barebones/foo.cabal
b/project_template/barebones/foo.cabal
index 48ca101..75f4c00 100644
--- a/project_template/barebones/foo.cabal
+++ b/project_template/barebones/foo.cabal
@@ -15,17 +15,12 @@ Executable projname
main-is: Main.hs
Build-depends:
- MonadCatchIO-transformers,
- base >= 4,
- bytestring >= 0.9.1 && <0.10,
- containers,
- filepath >= 1.1 && <1.2,
- haskell98,
- mtl >= 2 && <3,
- snap-core >= 0.2 && <0.3,
- snap-server >= 0.2 && <0.3,
- text,
- unix
+ base >= 4 && < 5,
+ bytestring >= 0.9.1 && < 0.10,
+ MonadCatchIO-transformers >= 0.2.1 && < 0.3,
+ mtl >= 2 && < 3,
+ snap-core >= 0.3 && <0.4,
+ snap-server >= 0.3 && <0.4
if impl(ghc >= 6.12.0)
ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
