[DHG_packages] 01/06: refresh haskell-snap patches
Sean Whitton
spw-guest at moszumanska.debian.org
Wed Jun 1 01:35:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
spw-guest pushed a commit to branch LTS-6
in repository DHG_packages.
commit 9c1e42d53bb59937ed716c0d2019bc5d1dfefd06
Author: Sean Whitton <spwhitton at spwhitton.name>
Date: Wed Jun 1 10:26:51 2016 +0900
refresh haskell-snap patches
---
p/haskell-snap/debian/changelog | 5 ++-
.../debian/patches/newer-aeson-and-cereal-and-lens | 24 -------------
p/haskell-snap/debian/patches/rename-snap-binary | 40 +++++++++-------------
p/haskell-snap/debian/patches/series | 1 -
4 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/p/haskell-snap/debian/changelog b/p/haskell-snap/debian/changelog
index 1a42b40..1478b76 100644
--- a/p/haskell-snap/debian/changelog
+++ b/p/haskell-snap/debian/changelog
@@ -7,7 +7,10 @@ haskell-snap (0.14.0.7-1) unstable; urgency=medium
[ Joachim Breitner ]
* New upstream release
- -- Joachim Breitner <nomeata at debian.org> Mon, 30 May 2016 17:06:17 +0200
+ [ Sean Whitton ]
+ * Drop obsolete newer-aeson-and-cereal-and-lens patch.
+
+ -- Sean Whitton <spwhitton at spwhitton.name> Wed, 01 Jun 2016 10:13:39 +0900
haskell-snap (0.14.0.6-4) unstable; urgency=medium
diff --git a/p/haskell-snap/debian/patches/newer-aeson-and-cereal-and-lens b/p/haskell-snap/debian/patches/newer-aeson-and-cereal-and-lens
deleted file mode 100644
index a707e3a..0000000
--- a/p/haskell-snap/debian/patches/newer-aeson-and-cereal-and-lens
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/snap.cabal
-+++ b/snap.cabal
-@@ -147,10 +147,10 @@
- build-depends:
- MonadCatchIO-transformers >= 0.2 && < 0.4,
- -- Blacklist aeson versions with problems from lack of upper bounds
-- aeson (>= 0.6 && < 0.7) || (>= 0.7.0.4 && < 0.10),
-+ aeson (>= 0.6 && < 0.7) || (>= 0.7.0.4 && < 0.11),
- attoparsec >= 0.10 && < 0.14,
- bytestring >= 0.9.1 && < 0.11,
-- cereal >= 0.3 && < 0.5,
-+ cereal >= 0.3 && < 0.6,
- clientsession >= 0.8 && < 0.10,
- comonad >= 1.1 && < 4.3,
- configurator >= 0.1 && < 0.4,
-@@ -187,7 +187,7 @@
- else
- build-depends:
- base >= 4.4 && < 5,
-- lens >= 3.7.6 && < 4.13
-+ lens >= 3.7.6 && < 4.14
-
- extensions:
- BangPatterns,
diff --git a/p/haskell-snap/debian/patches/rename-snap-binary b/p/haskell-snap/debian/patches/rename-snap-binary
index 4436fa4..639f020 100644
--- a/p/haskell-snap/debian/patches/rename-snap-binary
+++ b/p/haskell-snap/debian/patches/rename-snap-binary
@@ -4,11 +4,9 @@ Author: Joachim Breitner <nomeata at debian.org>
Bug-Debian: http://bugs.debian.org/741503
Forwarded: not-needed
-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 @@
+--- a/snap.cabal
++++ b/snap.cabal
+@@ -16,7 +16,7 @@ description:
@$ cabal install snap
$ mkdir myproject
$ cd myproject
@@ -17,20 +15,18 @@ Index: snap-0.13.2.9/snap.cabal
.
If you have trouble or any questions, see our FAQ page
(<http://snapframework.com/faq>) or the documentation
-@@ -215,7 +215,7 @@
+@@ -216,7 +216,7 @@ Library
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
-fno-warn-orphans
-
+
-Executable snap
+Executable snap-framework
hs-source-dirs: src
main-is: Snap/Starter.hs
-
-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 @@
+
+--- a/src/Snap/Starter.hs
++++ b/src/Snap/Starter.hs
+@@ -30,7 +30,7 @@ usage = unlines
, ""
, "Usage:"
, ""
@@ -39,7 +35,7 @@ Index: snap-0.13.2.9/src/Snap/Starter.hs
, ""
, " <action> can be one of:"
, " init - create a new project directory structure in the " ++
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ initUsage = unlines
, ""
, "Usage:"
, ""
@@ -48,12 +44,10 @@ Index: snap-0.13.2.9/src/Snap/Starter.hs
, ""
, " [type] can be one of:"
, " default - A default project using snaplets and heist"
-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 @@
-
+--- a/test/suite/Snap/TestCommon.hs
++++ b/test/suite/Snap/TestCommon.hs
+@@ -35,7 +35,7 @@ import SafeCWD
+
------------------------------------------------------------------------------
testGeneratedProject :: String -- ^ project name and directory
- -> String -- ^ arguments to @snap init@
@@ -61,7 +55,7 @@ Index: snap-0.13.2.9/test/suite/Snap/TestCommon.hs
-> 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 @@
+@@ -94,11 +94,11 @@ testGeneratedProject projName snapInitAr
findSnap = do
home <- fromEnv "HOME" "."
p1 <- gimmeIfExists $ snapRoot </> "dist" </> "build"
@@ -71,9 +65,9 @@ Index: snap-0.13.2.9/test/suite/Snap/TestCommon.hs
+ </> "snap-framework" </> "snap-framework"
+ p2 <- gimmeIfExists $ home </> ".cabal" </> "bin" </> "snap-framework"
+ p3 <- findExecutable "snap-framework"
-
+
- return $ fromMaybe (error "couldn't find snap executable")
+ return $ fromMaybe (error "couldn't find snap-framework executable")
(getFirst $ mconcat $ map First [p1,p2,p3])
-
+
--------------------------------------------------------------------------
diff --git a/p/haskell-snap/debian/patches/series b/p/haskell-snap/debian/patches/series
index 91d220b..e341243 100644
--- a/p/haskell-snap/debian/patches/series
+++ b/p/haskell-snap/debian/patches/series
@@ -1,2 +1 @@
rename-snap-binary
-newer-aeson-and-cereal-and-lens
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list