[Git][haskell-team/DHG_packages][master] 5 commits: BlogLiterately: drop patches
Clint Adams
gitlab at salsa.debian.org
Mon Apr 9 22:34:42 UTC 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f3c86eee by Clint Adams at 2018-04-09T18:28:20-04:00
BlogLiterately: drop patches
- - - - -
e00ca225 by Clint Adams at 2018-04-09T18:29:35-04:00
cabal-install: drop patches
- - - - -
b002805e by Clint Adams at 2018-04-09T18:31:20-04:00
cassava: drop patches
- - - - -
9167cd73 by Clint Adams at 2018-04-09T18:32:04-04:00
chell-quickcheck: drop patches
- - - - -
8f030130 by Clint Adams at 2018-04-09T18:34:19-04:00
conduit-extra: refresh patch
- - - - -
12 changed files:
- − p/haskell-blogliterately/debian/patches/LaTeXMathML-type-change
- − p/haskell-blogliterately/debian/patches/newer-blaze-html
- − p/haskell-blogliterately/debian/patches/series
- − p/haskell-cabal-install/debian/patches/series
- − p/haskell-cabal-install/debian/patches/use-cryptohash
- p/haskell-cassava/debian/control
- − p/haskell-cassava/debian/patches/newer-vector
- − p/haskell-cassava/debian/patches/series
- − p/haskell-chell-quickcheck2/debian/patches/newer-quickcheck
- − p/haskell-chell-quickcheck2/debian/patches/series
- p/haskell-conduit-extra/debian/control
- p/haskell-conduit-extra/debian/patches/no-bytestring-builder
Changes:
=====================================
p/haskell-blogliterately/debian/patches/LaTeXMathML-type-change deleted
=====================================
--- a/p/haskell-blogliterately/debian/patches/LaTeXMathML-type-change
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: b/src/Text/BlogLiterately/Transform.hs
-===================================================================
---- a/src/Text/BlogLiterately/Transform.hs
-+++ b/src/Text/BlogLiterately/Transform.hs
-@@ -562,7 +562,7 @@ xformDoc bl xforms =
- }
- mathOption opt
- | opt `isPrefixOf` "latexmathml" ||
-- opt `isPrefixOf` "asciimathml" = LaTeXMathML (mathUrlMaybe opt)
-+ opt `isPrefixOf` "asciimathml" = LaTeXMathML (mathUrl latexmathmlURL opt)
- | opt `isPrefixOf` "mathml" = MathML (mathUrlMaybe opt)
- | opt `isPrefixOf` "mimetex" =
- WebTeX (mathUrl "/cgi-bin/mimetex.cgi?" opt)
-@@ -575,6 +575,7 @@ xformDoc bl xforms =
- webTeXURL = "http://chart.apis.google.com/chart?cht=tx&chl="
- mathJaxURL = "http://cdn.mathjax.org/mathjax/latest/MathJax.js"
- ++ "?config=TeX-AMS-MML_HTMLorMML"
-+ latexmathmlURL = "http://math.etsu.edu/LaTeXMathML/LaTeXMathML.js"
-
- urlPart = drop 1 . dropWhile (/='=')
-
=====================================
p/haskell-blogliterately/debian/patches/newer-blaze-html deleted
=====================================
--- a/p/haskell-blogliterately/debian/patches/newer-blaze-html
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Newer dependencies from hackage
-Origin: upstream, https://hackage.haskell.org/package/BlogLiterately-0.8.4.3/revisions/
----
-
-Index: b/BlogLiterately.cabal
-===================================================================
---- a/BlogLiterately.cabal
-+++ b/BlogLiterately.cabal
-@@ -54,7 +54,7 @@ Library
- parsec >= 3 && < 3.2,
- HaXml >= 1.22 && < 1.26,
- hscolour >= 1.20 && < 1.25,
-- blaze-html >= 0.5 && < 0.9,
-+ blaze-html >= 0.5 && < 0.10,
- cmdargs >= 0.9.5 && < 0.11,
- haxr >= 3000.11 && < 3000.12,
- pandoc >= 1.19 && < 1.20,
=====================================
p/haskell-blogliterately/debian/patches/series deleted
=====================================
--- a/p/haskell-blogliterately/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-LaTeXMathML-type-change
-newer-blaze-html
=====================================
p/haskell-cabal-install/debian/patches/series deleted
=====================================
--- a/p/haskell-cabal-install/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use-cryptohash
=====================================
p/haskell-cabal-install/debian/patches/use-cryptohash deleted
=====================================
--- a/p/haskell-cabal-install/debian/patches/use-cryptohash
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cabal-install.cabal
-+++ b/cabal-install.cabal
-@@ -267,7 +267,7 @@
- bytestring >= 0.9 && < 1,
- Cabal >= 1.24.2 && < 1.25,
- containers >= 0.4 && < 0.6,
-- cryptohash-sha256 >= 0.11 && < 0.12,
-+ cryptohash,
- filepath >= 1.3 && < 1.5,
- hashable >= 1.0 && < 2,
- HTTP >= 4000.1.5 && < 4000.4,
=====================================
p/haskell-cassava/debian/control
=====================================
--- a/p/haskell-cassava/debian/control
+++ b/p/haskell-cassava/debian/control
@@ -16,9 +16,6 @@ Build-Depends:
libghc-attoparsec-dev (>= 0.11.3.0),
libghc-attoparsec-dev (<< 0.14),
libghc-attoparsec-prof,
- libghc-bytestring-builder-dev (>= 0.10.8),
- libghc-bytestring-builder-dev (<< 0.11),
- libghc-bytestring-builder-prof,
libghc-hashable-dev (<< 1.3),
libghc-hashable-prof,
libghc-scientific-dev (>= 0.3.4.7),
@@ -55,7 +52,6 @@ Build-Depends:
Build-Depends-Indep: ghc-doc,
libghc-only-doc,
libghc-attoparsec-doc,
- libghc-bytestring-builder-doc,
libghc-hashable-doc,
libghc-scientific-doc,
libghc-text-doc,
=====================================
p/haskell-cassava/debian/patches/newer-vector deleted
=====================================
--- a/p/haskell-cassava/debian/patches/newer-vector
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cassava.cabal
-+++ b/cassava.cabal
-@@ -70,7 +70,7 @@ Library
- hashable < 1.3,
- text < 1.3,
- unordered-containers < 0.3,
-- vector < 0.12
-+ vector < 0.13
-
- -- GHC.Generics lived in `ghc-prim` for GHC 7.2 & GHC 7.4 only
- if impl(ghc < 7.6)
=====================================
p/haskell-cassava/debian/patches/series deleted
=====================================
--- a/p/haskell-cassava/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-vector
=====================================
p/haskell-chell-quickcheck2/debian/patches/newer-quickcheck deleted
=====================================
--- a/p/haskell-chell-quickcheck2/debian/patches/newer-quickcheck
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/chell-quickcheck.cabal
-+++ b/chell-quickcheck.cabal
-@@ -28,7 +28,7 @@
- build-depends:
- base >= 4.0 && < 5.0
- , chell >= 0.3 && < 0.5
-- , QuickCheck >= 2.3 && < 2.9
-+ , QuickCheck >= 2.3 && < 2.10
- , random
-
- exposed-modules:
---- a/lib/Test/Chell/QuickCheck.hs
-+++ b/lib/Test/Chell/QuickCheck.hs
-@@ -100,10 +100,4 @@
- roundTo n m = (n `div` m) * m
-
- maxDiscardedTests :: QuickCheck.Testable prop => QuickCheck.Args -> prop -> Int
--#if MIN_VERSION_QuickCheck(2,5,0)
--maxDiscardedTests args p = if QuickCheck.exhaustive p
-- then QuickCheck.maxDiscardRatio args
-- else QuickCheck.maxDiscardRatio args * QuickCheck.maxSuccess args
--#else
--maxDiscardedTests args _ = QuickCheck.maxDiscard args
--#endif
-+maxDiscardedTests args _ = QuickCheck.maxDiscardRatio args
=====================================
p/haskell-chell-quickcheck2/debian/patches/series deleted
=====================================
--- a/p/haskell-chell-quickcheck2/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-quickcheck
=====================================
p/haskell-conduit-extra/debian/control
=====================================
--- a/p/haskell-conduit-extra/debian/control
+++ b/p/haskell-conduit-extra/debian/control
@@ -35,7 +35,6 @@ Build-Depends:
libghc-unliftio-core-prof,
libghc-quickcheck2-dev,
libghc-attoparsec-dev,
- libghc-bytestring-builder-dev,
libghc-conduit-dev,
libghc-exceptions-dev,
libghc-hspec-dev (>= 1.3),
=====================================
p/haskell-conduit-extra/debian/patches/no-bytestring-builder
=====================================
--- a/p/haskell-conduit-extra/debian/patches/no-bytestring-builder
+++ b/p/haskell-conduit-extra/debian/patches/no-bytestring-builder
@@ -4,17 +4,17 @@ Author: Joachim Breitner <nomeata at debian.org>
Forwarded: not-needed, debian specific
--- a/conduit-extra.cabal
+++ b/conduit-extra.cabal
-@@ -78,7 +78,6 @@
+@@ -73,7 +73,6 @@
+
, async
, attoparsec
- , blaze-builder
- , bytestring-builder
, bytestring
, exceptions
, process
-@@ -113,7 +112,6 @@
+@@ -108,7 +107,6 @@
, conduit-extra
- , criterion
+ , gauge
, bytestring
- , bytestring-builder
, transformers
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/e4b8a924b962b4981b39eeced209e6fdee26656e...8f0301308c0556554b5cdc272c6557543f790dea
---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/e4b8a924b962b4981b39eeced209e6fdee26656e...8f0301308c0556554b5cdc272c6557543f790dea
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20180409/9d0a5662/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list