[Pkg-haskell-commits] darcs: haskell-happstack-heist: New upstream version 7.2.0.

[Clint Adams]

Mon Nov 25 18:24:21 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 7.2.0.

    M ./changelog -2 +6
    M ./control -5 +5
    A ./patches/newer-either.diff
    R ./patches/newer-heist.diff
    M ./patches/series -1 +1

Mon Nov 25 18:24:21 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 7.2.0.
diff -rN -u old-haskell-happstack-heist/changelog new-haskell-happstack-heist/changelog
--- old-haskell-happstack-heist/changelog	2013-11-25 18:24:42.897292875 +0000
+++ new-haskell-happstack-heist/changelog	2013-11-25 18:24:42.897292875 +0000
@@ -1,8 +1,12 @@
-haskell-happstack-heist (7.1.0-2) UNRELEASED; urgency=low
+haskell-happstack-heist (7.2.0-1) unstable; urgency=low
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:20:28 +0200
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Mon, 25 Nov 2013 13:18:20 -0500
 
 haskell-happstack-heist (7.1.0-1) unstable; urgency=low
 
diff -rN -u old-haskell-happstack-heist/control new-haskell-happstack-heist/control
--- old-haskell-happstack-heist/control	2013-11-25 18:24:42.897292875 +0000
+++ new-haskell-happstack-heist/control	2013-11-25 18:24:42.897292875 +0000
@@ -12,13 +12,13 @@
   , libghc-blaze-builder-dev (<< 0.4)
   , libghc-blaze-builder-prof
   , libghc-either-dev (>> 3.4)
-  , libghc-either-dev (<< 3.5)
+  , libghc-either-dev (<< 4.1)
   , libghc-either-prof
   , libghc-happstack-server-dev (>> 7.0)
-  , libghc-happstack-server-dev (<< 7.2)
+  , libghc-happstack-server-dev (<< 7.4)
   , libghc-happstack-server-prof
-  , libghc-heist-dev (>> 0.11)
-  , libghc-heist-dev (<< 0.13)
+  , libghc-heist-dev (>= 0.13)
+  , libghc-heist-dev (<< 0.14)
   , libghc-heist-prof
   , libghc-mtl-dev (>> 2)
   , libghc-mtl-dev (<< 3)
@@ -33,7 +33,7 @@
   , libghc-heist-doc
   , libghc-mtl-doc
   , libghc-text-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/happstack-heist
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-happstack-heist
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-happstack-heist
diff -rN -u old-haskell-happstack-heist/patches/newer-either.diff new-haskell-happstack-heist/patches/newer-either.diff
--- old-haskell-happstack-heist/patches/newer-either.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-happstack-heist/patches/newer-either.diff	2013-11-25 18:24:42.901292876 +0000
@@ -0,0 +1,11 @@
+--- a/happstack-heist.cabal
++++ b/happstack-heist.cabal
+@@ -22,7 +22,7 @@
+   Build-depends:       base             >= 3.0 && < 5.0,
+                        blaze-builder    >= 0.2 && <0.4,
+                        bytestring       >= 0.9 && < 0.11,
+-                       either           == 3.4.*,
++                       either           >= 3.4 && < 4.1,
+                        filepath,
+                        happstack-server >= 7.0 && < 7.4,
+                        heist            >= 0.13 && < 0.14,
diff -rN -u old-haskell-happstack-heist/patches/newer-heist.diff new-haskell-happstack-heist/patches/newer-heist.diff
--- old-haskell-happstack-heist/patches/newer-heist.diff	2013-11-25 18:24:42.897292875 +0000
+++ new-haskell-happstack-heist/patches/newer-heist.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
---- a/happstack-heist.cabal
-+++ b/happstack-heist.cabal
-@@ -25,6 +25,6 @@
-                        either           == 3.4.*,
-                        filepath,
-                        happstack-server >= 7.0 && < 7.2,
--                       heist            >= 0.11 && < 0.12,
-+                       heist            >= 0.12 && < 0.13,
-                        mtl              == 2.*,
-                        text             >= 0.10 && < 0.12
---- a/Happstack/Server/Heist.hs
-+++ b/Happstack/Server/Heist.hs
-@@ -94,11 +94,10 @@
-                   -> m (Either [String] (HeistState n))
- initHeistCompiled splices attrSplices templateDir =
-     liftIO $ runEitherT $
--           do templateRepo <- loadTemplates templateDir
-               initHeist $ mempty { hcLoadTimeSplices  = defaultLoadTimeSplices
-                                  , hcCompiledSplices  = splices
-                                  , hcAttributeSplices = attrSplices
--                                 , hcTemplates        = templateRepo
-+                                 , hcTemplateLocations = [loadTemplates templateDir]
-                                  }
- 
- heistServe :: (Happstack m) =>
diff -rN -u old-haskell-happstack-heist/patches/series new-haskell-happstack-heist/patches/series
--- old-haskell-happstack-heist/patches/series	2013-11-25 18:24:42.897292875 +0000
+++ new-haskell-happstack-heist/patches/series	2013-11-25 18:24:42.901292876 +0000
@@ -1 +1 @@
-newer-heist.diff
+newer-either.diff