[Pkg-haskell-commits] [package-plan] 01/02: Forgot to git add the patches
Joachim Breitner
nomeata at moszumanska.debian.org
Sat Jun 27 13:47:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch LTS-2.15
in repository package-plan.
commit 988784cdc6dc0e0bf22e159faf7f054b4948817c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sat Jun 27 15:46:48 2015 +0200
Forgot to git add the patches
---
.../0.2.1.0/no-bytestring-builder | 13 +++++++
patches/blaze-builder-enumerator/0.2.1.0/series | 1 +
patches/conduit-extra/1.1.9/no-bytestring-builder | 14 ++++++++
patches/conduit-extra/1.1.9/series | 1 +
.../2.1.4/faster-pwstore.diff | 15 ++++++++
patches/happstack-authenticate/2.1.4/series | 1 +
patches/hledger-web/0.25.1/no-network-conduit.diff | 20 +++++++++++
patches/hledger-web/0.25.1/series | 2 ++
patches/hledger/0.24.1/no-shakespeare-text | 34 ++++++++++++++++++
patches/hledger/0.24.1/series | 1 +
patches/hledger/0.25.1/no-shakespeare-text | 42 ++++++++++++++++++++++
patches/hledger/0.25.1/series | 1 +
patches/tasty/0.10.1.2/regex-tdfa.diff | 13 +++++++
patches/tasty/0.10.1.2/series | 1 +
patches/xmonad/0.11.1/relax-utf8-string-dep | 13 +++++++
patches/xmonad/0.11.1/series | 1 +
16 files changed, 173 insertions(+)
diff --git a/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder b/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder
new file mode 100644
index 0000000..91e130f
--- /dev/null
+++ b/patches/blaze-builder-enumerator/0.2.1.0/no-bytestring-builder
@@ -0,0 +1,13 @@
+Index: blaze-builder-enumerator-0.2.1.0/blaze-builder-enumerator.cabal
+===================================================================
+--- blaze-builder-enumerator-0.2.1.0.orig/blaze-builder-enumerator.cabal 2015-06-27 15:19:55.601243353 +0200
++++ blaze-builder-enumerator-0.2.1.0/blaze-builder-enumerator.cabal 2015-06-27 15:21:17.279058572 +0200
+@@ -50,7 +50,7 @@
+
+ if flag(newbuilder)
+ Build-depends:
+- bytestring-builder >= 0.10.4 && <0.11
++ bytestring >= 0.10.4 && <0.11
+ , blaze-builder >= 0.4 && <0.5
+ else
+ Build-depends:
diff --git a/patches/blaze-builder-enumerator/0.2.1.0/series b/patches/blaze-builder-enumerator/0.2.1.0/series
new file mode 100644
index 0000000..d61cbb2
--- /dev/null
+++ b/patches/blaze-builder-enumerator/0.2.1.0/series
@@ -0,0 +1 @@
+no-bytestring-builder
diff --git a/patches/conduit-extra/1.1.9/no-bytestring-builder b/patches/conduit-extra/1.1.9/no-bytestring-builder
new file mode 100644
index 0000000..3b222db
--- /dev/null
+++ b/patches/conduit-extra/1.1.9/no-bytestring-builder
@@ -0,0 +1,14 @@
+Index: conduit-extra-1.1.7.1/conduit-extra.cabal
+===================================================================
+--- conduit-extra-1.1.7.1.orig/conduit-extra.cabal 2015-04-06 13:33:45.464741391 +0200
++++ conduit-extra-1.1.7.1/conduit-extra.cabal 2015-04-06 13:34:57.374338797 +0200
+@@ -70,8 +70,7 @@
+ , async
+ , attoparsec
+ , blaze-builder
+- , bytestring-builder
+- , bytestring
++ , bytestring >= 0.10.4
+ , exceptions
+ , process
+ , resourcet
diff --git a/patches/conduit-extra/1.1.9/series b/patches/conduit-extra/1.1.9/series
new file mode 100644
index 0000000..d61cbb2
--- /dev/null
+++ b/patches/conduit-extra/1.1.9/series
@@ -0,0 +1 @@
+no-bytestring-builder
diff --git a/patches/happstack-authenticate/2.1.4/faster-pwstore.diff b/patches/happstack-authenticate/2.1.4/faster-pwstore.diff
new file mode 100644
index 0000000..608e59e
--- /dev/null
+++ b/patches/happstack-authenticate/2.1.4/faster-pwstore.diff
@@ -0,0 +1,15 @@
+pwstore-fast is already in Debian and is reportedly much faster.
+
+Index: happstack-authenticate-2.1.4/happstack-authenticate.cabal
+===================================================================
+--- happstack-authenticate-2.1.4.orig/happstack-authenticate.cabal 2015-06-27 14:48:59.191710671 +0200
++++ happstack-authenticate-2.1.4/happstack-authenticate.cabal 2015-06-27 14:48:59.187710596 +0200
+@@ -66,7 +66,7 @@
+ mime-mail >= 0.4 && < 0.5,
+ mtl >= 2.0 && < 2.3,
+ lens >= 4.2 && < 4.10,
+- pwstore-purehaskell == 2.1.*,
++ pwstore-fast,
+ text >= 0.11 && < 1.3,
+ time >= 1.2 && < 1.6,
+ random >= 1.0 && < 1.2,
diff --git a/patches/happstack-authenticate/2.1.4/series b/patches/happstack-authenticate/2.1.4/series
new file mode 100644
index 0000000..d1ea239
--- /dev/null
+++ b/patches/happstack-authenticate/2.1.4/series
@@ -0,0 +1 @@
+faster-pwstore.diff
diff --git a/patches/hledger-web/0.25.1/no-network-conduit.diff b/patches/hledger-web/0.25.1/no-network-conduit.diff
new file mode 100644
index 0000000..9d7845c
--- /dev/null
+++ b/patches/hledger-web/0.25.1/no-network-conduit.diff
@@ -0,0 +1,20 @@
+Index: hledger-web-0.25.1/hledger-web.cabal
+===================================================================
+--- hledger-web-0.25.1.orig/hledger-web.cabal 2015-06-27 15:30:06.370463313 +0200
++++ hledger-web-0.25.1/hledger-web.cabal 2015-06-27 15:30:06.366463229 +0200
+@@ -175,7 +175,6 @@
+ , http-conduit
+ , http-client
+ , HUnit
+- , network-conduit
+ , conduit-extra
+ , parsec >= 3
+ , regexpr >= 0.5.1
+@@ -250,7 +249,6 @@
+ , http-conduit
+ , http-client
+ , HUnit
+- , network-conduit
+ , conduit-extra
+ , parsec >= 3
+ , regexpr >= 0.5.1
diff --git a/patches/hledger-web/0.25.1/series b/patches/hledger-web/0.25.1/series
new file mode 100644
index 0000000..78b7600
--- /dev/null
+++ b/patches/hledger-web/0.25.1/series
@@ -0,0 +1,2 @@
+no-network-conduit.diff
+
diff --git a/patches/hledger/0.24.1/no-shakespeare-text b/patches/hledger/0.24.1/no-shakespeare-text
new file mode 100644
index 0000000..5d48ec6
--- /dev/null
+++ b/patches/hledger/0.24.1/no-shakespeare-text
@@ -0,0 +1,34 @@
+Index: hledger-0.24.1/hledger.cabal
+===================================================================
+--- hledger-0.24.1.orig/hledger.cabal 2015-06-27 15:35:30.537281649 +0200
++++ hledger-0.24.1/hledger.cabal 2015-06-27 15:35:30.533281565 +0200
+@@ -92,8 +92,7 @@
+ -- and shakespeare. When you're ready to drop backwards compatibility,
+ -- simply put a lower bound of >= 2.0 on shakespeare and remove the
+ -- deprecated packages.
+- ,shakespeare-text >= 1.0 && < 1.2
+- ,shakespeare >= 1.0 && < 2.1
++ ,shakespeare >= 2.0 && < 2.1
+ ,split >= 0.1 && < 0.3
+ ,text >= 0.11
+ ,tabular >= 0.2 && < 0.3
+@@ -134,8 +133,7 @@
+ ,regex-tdfa
+ ,regexpr >= 0.5.1
+ ,safe >= 0.2
+- ,shakespeare-text >= 1.0 && < 1.2
+- ,shakespeare >= 1.0 && < 2.1
++ ,shakespeare >= 2.0 && < 2.1
+ ,split >= 0.1 && < 0.3
+ ,tabular >= 0.2 && < 0.3
+ ,text >= 0.11
+@@ -173,8 +171,7 @@
+ , regex-tdfa
+ , regexpr
+ , safe
+- , shakespeare-text >= 1.0 && < 1.2
+- , shakespeare >= 1.0 && < 2.1
++ , shakespeare >= 2.0 && < 2.1
+ , split
+ ,tabular >= 0.2 && < 0.3
+ , test-framework
diff --git a/patches/hledger/0.24.1/series b/patches/hledger/0.24.1/series
new file mode 100644
index 0000000..d69449a
--- /dev/null
+++ b/patches/hledger/0.24.1/series
@@ -0,0 +1 @@
+no-shakespeare-text
diff --git a/patches/hledger/0.25.1/no-shakespeare-text b/patches/hledger/0.25.1/no-shakespeare-text
new file mode 100644
index 0000000..3ca6120
--- /dev/null
+++ b/patches/hledger/0.25.1/no-shakespeare-text
@@ -0,0 +1,42 @@
+Index: hledger-0.25.1/hledger.cabal
+===================================================================
+--- hledger-0.25.1.orig/hledger.cabal 2015-06-27 15:25:05.108030253 +0200
++++ hledger-0.25.1/hledger.cabal 2015-06-27 15:25:51.181022665 +0200
+@@ -100,15 +100,8 @@
+ ,tabular >= 0.2 && < 0.3
+ ,utf8-string >= 0.3.5 && < 1.1
+ ,wizards == 1.0.*
+- if impl(ghc >= 7.10)
+- -- ghc 7.10 requires shakespeare 2.0.2.2+
+- build-depends: shakespeare >= 2.0.2.2 && < 2.1
+- else
+- -- for older ghcs, allow shakespeare 2.x or 1.x (which also requires shakespeare-text)
+- -- http://www.yesodweb.com/blog/2014/04/consolidation-progress
+- build-depends:
+- shakespeare >= 1.0 && < 2.1
+- ,shakespeare-text >= 1.0 && < 1.2
++ ,shakespeare >= 2.0 && < 2.1
++
+ if flag(old-locale)
+ build-depends: time < 1.5, old-locale
+ else
+@@ -150,8 +143,7 @@
+ ,regex-tdfa
+ ,regexpr >= 0.5.1
+ ,safe >= 0.2
+- ,shakespeare-text >= 1.0 && < 1.2
+- ,shakespeare >= 1.0 && < 2.1
++ ,shakespeare >= 2.0 && < 2.1
+ ,split >= 0.1 && < 0.3
+ ,tabular >= 0.2 && < 0.3
+ ,text >= 0.11
+@@ -193,8 +185,7 @@
+ , regex-tdfa
+ , regexpr
+ , safe
+- , shakespeare-text >= 1.0 && < 1.2
+- , shakespeare >= 1.0 && < 2.1
++ , shakespeare >= 2.0 && < 2.1
+ , split
+ ,tabular >= 0.2 && < 0.3
+ , test-framework
diff --git a/patches/hledger/0.25.1/series b/patches/hledger/0.25.1/series
new file mode 100644
index 0000000..d69449a
--- /dev/null
+++ b/patches/hledger/0.25.1/series
@@ -0,0 +1 @@
+no-shakespeare-text
diff --git a/patches/tasty/0.10.1.2/regex-tdfa.diff b/patches/tasty/0.10.1.2/regex-tdfa.diff
new file mode 100644
index 0000000..a7ba379
--- /dev/null
+++ b/patches/tasty/0.10.1.2/regex-tdfa.diff
@@ -0,0 +1,13 @@
+Index: tasty-0.10.1/tasty.cabal
+===================================================================
+--- tasty-0.10.1.orig/tasty.cabal 2014-12-21 14:59:19.509001668 +0100
++++ tasty-0.10.1/tasty.cabal 2014-12-21 14:59:29.941201256 +0100
+@@ -53,7 +53,7 @@
+ containers,
+ mtl,
+ tagged >= 0.5,
+- regex-tdfa-rc >= 1.1.8.2,
++ regex-tdfa >= 1.2,
+ optparse-applicative >= 0.11,
+ deepseq >= 1.3,
+ unbounded-delays >= 0.1,
diff --git a/patches/tasty/0.10.1.2/series b/patches/tasty/0.10.1.2/series
new file mode 100644
index 0000000..f4943a7
--- /dev/null
+++ b/patches/tasty/0.10.1.2/series
@@ -0,0 +1 @@
+regex-tdfa.diff
diff --git a/patches/xmonad/0.11.1/relax-utf8-string-dep b/patches/xmonad/0.11.1/relax-utf8-string-dep
new file mode 100644
index 0000000..0dec9a1
--- /dev/null
+++ b/patches/xmonad/0.11.1/relax-utf8-string-dep
@@ -0,0 +1,13 @@
+Index: xmonad-0.11.1/xmonad.cabal
+===================================================================
+--- xmonad-0.11.1.orig/xmonad.cabal 2015-06-27 15:12:11.430371165 +0200
++++ xmonad-0.11.1/xmonad.cabal 2015-06-27 15:12:56.963495179 +0200
+@@ -58,7 +58,7 @@
+ else
+ build-depends: base < 3
+ build-depends: X11>=1.5 && < 1.7, mtl, unix,
+- utf8-string >= 0.3 && < 0.4
++ utf8-string >= 0.3 && < 1.1
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall
diff --git a/patches/xmonad/0.11.1/series b/patches/xmonad/0.11.1/series
new file mode 100644
index 0000000..3a02a7a
--- /dev/null
+++ b/patches/xmonad/0.11.1/series
@@ -0,0 +1 @@
+relax-utf8-string-dep
--
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