[Pkg-haskell-commits] darcs: haskell-snap: Refresh patches

[Joachim Breitner]

Sun Dec 21 23:30:23 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches

    A ./patches/newer-lens
    M ./patches/rename-snap-binary -12 +18
    M ./patches/series +1

Sun Dec 21 23:30:23 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
diff -rN -u old-haskell-snap/patches/newer-lens new-haskell-snap/patches/newer-lens
--- old-haskell-snap/patches/newer-lens	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-snap/patches/newer-lens	2014-12-22 15:01:35.254511759 +0000
@@ -0,0 +1,13 @@
+Index: snap-0.13.2.9/snap.cabal
+===================================================================
+--- snap-0.13.2.9.orig/snap.cabal	2014-12-22 00:29:52.466018732 +0100
++++ snap-0.13.2.9/snap.cabal	2014-12-22 00:30:15.658479972 +0100
+@@ -186,7 +186,7 @@
+   else
+     build-depends:
+       base                      >= 4.4      && < 5,
+-      lens                      >= 3.7.6    && < 4.5
++      lens                      >= 3.7.6    && < 4.7
+ 
+   extensions:
+     BangPatterns,
diff -rN -u old-haskell-snap/patches/rename-snap-binary new-haskell-snap/patches/rename-snap-binary
--- old-haskell-snap/patches/rename-snap-binary	2014-12-22 15:01:35.250511756 +0000
+++ new-haskell-snap/patches/rename-snap-binary	2014-12-22 15:01:35.254511759 +0000
@@ -4,9 +4,11 @@
 Bug-Debian: http://bugs.debian.org/741503
 Forwarded: not-needed
 
---- haskell-snap-0.13.2.4.orig/snap.cabal
-+++ haskell-snap-0.13.2.4/snap.cabal
-@@ -16,7 +16,7 @@ description:
+Index: snap-0.13.2.9/snap.cabal
+===================================================================
+--- snap-0.13.2.9.orig/snap.cabal	2014-12-22 00:29:52.470018812 +0100
++++ snap-0.13.2.9/snap.cabal	2014-12-22 00:29:52.466018732 +0100
+@@ -16,7 +16,7 @@
      @$ cabal install snap
      $ mkdir myproject
      $ cd myproject
@@ -15,7 +17,7 @@
      .
      If you have trouble or any questions, see our FAQ page
      (<http://snapframework.com/faq>) or the documentation
-@@ -214,7 +214,7 @@ Library
+@@ -215,7 +215,7 @@
      ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
                   -fno-warn-orphans
  
@@ -24,9 +26,11 @@
    hs-source-dirs: src
    main-is: Snap/Starter.hs
  
---- haskell-snap-0.13.2.4.orig/src/Snap/Starter.hs
-+++ haskell-snap-0.13.2.4/src/Snap/Starter.hs
-@@ -30,7 +30,7 @@ usage = unlines
+Index: snap-0.13.2.9/src/Snap/Starter.hs
+===================================================================
+--- snap-0.13.2.9.orig/src/Snap/Starter.hs	2014-12-22 00:29:52.470018812 +0100
++++ snap-0.13.2.9/src/Snap/Starter.hs	2014-12-22 00:29:52.466018732 +0100
+@@ -30,7 +30,7 @@
      , ""
      , "Usage:"
      , ""
@@ -35,7 +39,7 @@
      , ""
      , "    <action> can be one of:"
      , "      init - create a new project directory structure in the " ++
-@@ -48,7 +48,7 @@ initUsage = unlines
+@@ -48,7 +48,7 @@
      , ""
      , "Usage:"
      , ""
@@ -44,9 +48,11 @@
      , ""
      , "    [type] can be one of:"
      , "      default   - A default project using snaplets and heist"
---- haskell-snap-0.13.2.4.orig/test/suite/Snap/TestCommon.hs
-+++ haskell-snap-0.13.2.4/test/suite/Snap/TestCommon.hs
-@@ -35,7 +35,7 @@ import SafeCWD
+Index: snap-0.13.2.9/test/suite/Snap/TestCommon.hs
+===================================================================
+--- snap-0.13.2.9.orig/test/suite/Snap/TestCommon.hs	2014-12-22 00:29:52.470018812 +0100
++++ snap-0.13.2.9/test/suite/Snap/TestCommon.hs	2014-12-22 00:29:52.466018732 +0100
+@@ -35,7 +35,7 @@
  
  ------------------------------------------------------------------------------
  testGeneratedProject :: String  -- ^ project name and directory
@@ -55,7 +61,7 @@
                       -> String  -- ^ arguments to @cabal install@
                       -> Int     -- ^ port to run http server on
                       -> IO ()   -- ^ action to run when the server goes up
-@@ -94,11 +94,11 @@ testGeneratedProject projName snapInitAr
+@@ -94,11 +94,11 @@
          findSnap = do
              home <- fromEnv "HOME" "."
              p1   <- gimmeIfExists $ snapRoot </> "dist" </> "build"
diff -rN -u old-haskell-snap/patches/series new-haskell-snap/patches/series
--- old-haskell-snap/patches/series	2014-12-22 15:01:35.250511756 +0000
+++ new-haskell-snap/patches/series	2014-12-22 15:01:35.254511759 +0000
@@ -1 +1,2 @@
 rename-snap-binary
+newer-lens