[Pkg-haskell-commits] [package-plan] 01/02: Update lens
Joachim Breitner
nomeata at moszumanska.debian.org
Mon Dec 22 00:02:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch ghc-7.8
in repository package-plan.
commit 34a9323250c139a3c351d5781a177b804d6c5622
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Mon Dec 22 00:32:02 2014 +0100
Update lens
---
packages.txt | 18 ++++----
patches/leksah/0.14.1.1/no-hamlet | 13 ++++++
patches/leksah/0.14.1.1/series | 1 +
patches/snap/0.13.2.9/newer-lens | 13 ++++++
patches/snap/0.13.2.9/rename-snap-binary | 79 ++++++++++++++++++++++++++++++++
patches/snap/0.13.2.9/series | 2 +
6 files changed, 117 insertions(+), 9 deletions(-)
diff --git a/packages.txt b/packages.txt
index e61d195..fa0078d 100644
--- a/packages.txt
+++ b/packages.txt
@@ -81,10 +81,10 @@ cautious-file 1.0.2
cereal 0.4.0.1
cereal-conduit 0.7.2.3
certificate 1.3.9
-cgi 3001.1.8.5
+cgi 3001.1.8.5 obsolete
charset 0.3.7
charsetdetect-ae 1.0.1
-Chart 1.3.1
+Chart 1.3.2
ChasingBottoms 1.3.0.8
chell 0.4 -fcolor-output
chell-hunit 0.2.1
@@ -169,11 +169,11 @@ dependent-sum 0.2.1.0
dependent-sum-template 0.0.0.1
derive 2.5.16
diagrams 1.2 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
-diagrams-cairo 1.2.0.3
-diagrams-core 1.2.0.2
+diagrams-cairo 1.2.0.4
+diagrams-core 1.2.0.4
diagrams-gtk 1.0.1.3
-diagrams-lib 1.2.0.4
-diagrams-svg 1.1.0.1
+diagrams-lib 1.2.0.7
+diagrams-svg 1.1.0.3
Diff 0.3.0
digest 0.0.1.2
dimensional 0.13.0.1
@@ -215,7 +215,7 @@ executable-path 0.0.3
explicit-exception 0.1.7.3
extensible-exceptions 0.1.1.4
failure 0.2.0.3
-fastcgi 3001.0.2.4
+fastcgi 3001.0.2.4 obsolete
fast-logger 2.2.3
fb 1.0.7 notest
fclabels 2.0.2
@@ -409,7 +409,7 @@ lazysmallcheck 0.6
LDAP 0.6.10
leksah 0.14.1.1 binary -fgtk3
leksah-server 0.14.0.1
-lens 4.4.0.2
+lens 4.6.0.1
lhs2tex 1.18.1 binary
libsystemd-journal 1.2.0
libtagc 0.12.0 obsolete
@@ -717,7 +717,7 @@ vector-space-points 0.2
vector-th-unbox 0.2.1.0
void 0.6.1
vte 0.13.0.0
-vty 5.2.5 notest
+vty 5.2.6 notest
wai 3.0.1.1
wai-app-file-cgi 3.0.1
wai-app-static 3.0.0.1
diff --git a/patches/leksah/0.14.1.1/no-hamlet b/patches/leksah/0.14.1.1/no-hamlet
new file mode 100644
index 0000000..64da7ba
--- /dev/null
+++ b/patches/leksah/0.14.1.1/no-hamlet
@@ -0,0 +1,13 @@
+Index: leksah-0.14.1.1/leksah.cabal
+===================================================================
+--- leksah-0.14.1.1.orig/leksah.cabal 2014-12-22 00:13:20.137997702 +0100
++++ leksah-0.14.1.1/leksah.cabal 2014-12-22 00:19:33.273531382 +0100
+@@ -237,7 +237,7 @@
+ build-depends: webkitgtk3 -any, webkitgtk3-javascriptcore -any
+ else
+ build-depends: webkit -any, webkit-javascriptcore -any
+- build-depends: jsaddle -any, ghcjs-codemirror -any, hamlet -any, blaze-html -any,
++ build-depends: jsaddle -any, ghcjs-codemirror -any, blaze-html -any,
+ lens -any, pretty-show >=1.6.3 && <1.7
+ cpp-options: -DWEBKITGTK -DLEKSAH_WITH_CODE_MIRROR
+
diff --git a/patches/leksah/0.14.1.1/series b/patches/leksah/0.14.1.1/series
new file mode 100644
index 0000000..576533e
--- /dev/null
+++ b/patches/leksah/0.14.1.1/series
@@ -0,0 +1 @@
+no-hamlet
diff --git a/patches/snap/0.13.2.9/newer-lens b/patches/snap/0.13.2.9/newer-lens
new file mode 100644
index 0000000..3928fc7
--- /dev/null
+++ b/patches/snap/0.13.2.9/newer-lens
@@ -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 --git a/patches/snap/0.13.2.9/rename-snap-binary b/patches/snap/0.13.2.9/rename-snap-binary
new file mode 100644
index 0000000..3bbd594
--- /dev/null
+++ b/patches/snap/0.13.2.9/rename-snap-binary
@@ -0,0 +1,79 @@
+Description: Rename snap binary
+ To avoid a conflict
+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 @@
+ @$ cabal install snap
+ $ mkdir myproject
+ $ cd myproject
+- $ snap init@
++ $ snap-framework init@
+ .
+ If you have trouble or any questions, see our FAQ page
+ (<http://snapframework.com/faq>) or the documentation
+@@ -215,7 +215,7 @@
+ 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 @@
+ , ""
+ , "Usage:"
+ , ""
+- , " snap <action>"
++ , " snap-framework <action>"
+ , ""
+ , " <action> can be one of:"
+ , " init - create a new project directory structure in the " ++
+@@ -48,7 +48,7 @@
+ , ""
+ , "Usage:"
+ , ""
+- , " snap init [type]"
++ , " snap-framework init [type]"
+ , ""
+ , " [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 @@
+
+ ------------------------------------------------------------------------------
+ testGeneratedProject :: String -- ^ project name and directory
+- -> String -- ^ arguments to @snap init@
++ -> String -- ^ arguments to @snap-framework init@
+ -> 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 @@
+ findSnap = do
+ home <- fromEnv "HOME" "."
+ p1 <- gimmeIfExists $ snapRoot </> "dist" </> "build"
+- </> "snap" </> "snap"
+- p2 <- gimmeIfExists $ home </> ".cabal" </> "bin" </> "snap"
+- p3 <- findExecutable "snap"
++ </> "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/patches/snap/0.13.2.9/series b/patches/snap/0.13.2.9/series
new file mode 100644
index 0000000..b1f60f2
--- /dev/null
+++ b/patches/snap/0.13.2.9/series
@@ -0,0 +1,2 @@
+rename-snap-binary
+newer-lens
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list