[Git][haskell-team/DHG_packages][master] 3 commits: haskell-edit-distance: patch for newer quickcheck

Gianfranco Costamagna gitlab at salsa.debian.org
Sun Aug 25 18:59:56 BST 2019



Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
6df80413 by Gianfranco Costamagna at 2019-08-25T13:58:04Z
haskell-edit-distance: patch for newer quickcheck

- - - - -
6759a5b2 by Gianfranco Costamagna at 2019-08-25T17:58:27Z
haskell-ed25519: fix build with newer deps, from Clint

- - - - -
7b583535 by Gianfranco Costamagna at 2019-08-25T17:59:30Z
haskell-equivalence: bump to new release, patch to avoid fail module

- - - - -


9 changed files:

- p/haskell-ed25519/debian/changelog
- p/haskell-ed25519/debian/control
- p/haskell-ed25519/debian/patches/newer-quickcheck
- p/haskell-edit-distance/debian/changelog
- p/haskell-edit-distance/debian/control
- p/haskell-edit-distance/debian/patches/newer-deps
- p/haskell-equivalence/debian/changelog
- + p/haskell-equivalence/debian/patches/drop-fail-dep.patch
- + p/haskell-equivalence/debian/patches/series


Changes:

=====================================
p/haskell-ed25519/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-ed25519 (0.0.5.0-13) unstable; urgency=medium
+
+  [ Clint Adams ]
+  * Fix build with newer quickcheck
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 25 Aug 2019 19:33:26 +0200
+
 haskell-ed25519 (0.0.5.0-12) unstable; urgency=medium
 
   * Update patches for newer doctest/quickcheck2


=====================================
p/haskell-ed25519/debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
  libghc-doctest-dev (>= 0.10),
  libghc-doctest-dev (<< 0.17),
  libghc-quickcheck2-dev (>= 2.4),
- libghc-quickcheck2-dev (<< 2.12),
+ libghc-quickcheck2-dev (<< 2.13),
 Build-Depends-Indep:
  ghc-doc,
 Standards-Version: 4.1.4


=====================================
p/haskell-ed25519/debian/patches/newer-quickcheck
=====================================
@@ -1,27 +1,30 @@
-Index: b/ed25519.cabal
-===================================================================
---- a/ed25519.cabal
-+++ b/ed25519.cabal
+--- haskell-ed25519-0.0.5.0.orig/ed25519.cabal
++++ haskell-ed25519-0.0.5.0/ed25519.cabal
 @@ -97,7 +97,7 @@ test-suite properties
      build-depends:
        base        >= 4   && < 5,
        bytestring  >= 0.9 && < 0.11,
 -      QuickCheck  >= 2.4 && < 2.9,
-+      QuickCheck  >= 2.4 && < 2.12,
++      QuickCheck  >= 2.4 && < 2.13,
        ed25519
  
  --
-Index: b/tests/properties.hs
-===================================================================
---- a/tests/properties.hs
-+++ b/tests/properties.hs
-@@ -86,7 +86,9 @@ tests ntests =
+--- haskell-ed25519-0.0.5.0.orig/tests/properties.hs
++++ haskell-ed25519-0.0.5.0/tests/properties.hs
+@@ -84,9 +84,16 @@ tests ntests =
+     wrap prop = do
+       r <- quickCheckWithResult stdArgs{maxSuccess=ntests} prop
        case r of
++#if MIN_VERSION_QuickCheck(2,12,0)
++        Success n _ _ _ _ _     -> return (True, n)
++        GaveUp  n _ _ _ _ _     -> return (True, n)
++#else
          Success n _ _           -> return (True, n)
          GaveUp  n _ _           -> return (True, n)
 -#if MIN_VERSION_QuickCheck(2,7,0)
-+#if MIN_VERSION_QuickCheck(2,11,0)
-+        Failure n _ _ _ _ _ _ _ _ _ _ -> return (False, n)
++#endif
++#if MIN_VERSION_QuickCheck(2,12,0)
++        Failure n _ _ _ _ _ _ _ _ _ _ _ _ -> return (False, n)
 +#elif MIN_VERSION_QuickCheck(2,7,0)
          Failure n _ _ _ _ _ _ _ _ _ -> return (False, n)
  #elif MIN_VERSION_QuickCheck(2,6,0)


=====================================
p/haskell-edit-distance/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-edit-distance (0.2.2.1-9) unstable; urgency=medium
+
+  * Patch for newer quick check
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 25 Aug 2019 15:56:51 +0200
+
 haskell-edit-distance (0.2.2.1-8) unstable; urgency=medium
 
   [ Clint Adams ]


=====================================
p/haskell-edit-distance/debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
  libghc-random-prof,
  libghc-test-framework-dev (>= 0.1.1),
  libghc-quickcheck2-dev (>= 2.4),
- libghc-quickcheck2-dev (<< 2.12),
+ libghc-quickcheck2-dev (<< 2.13),
  libghc-test-framework-quickcheck2-dev,
 Build-Depends-Indep: ghc-doc, libghc-random-doc
 Standards-Version: 4.1.4


=====================================
p/haskell-edit-distance/debian/patches/newer-deps
=====================================
@@ -5,7 +5,7 @@
    ghc-options:            -O2 -Wall
    build-depends:          base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1,
 -                          test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.9, test-framework-quickcheck2
-+                          test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.12, test-framework-quickcheck2
++                          test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.13, test-framework-quickcheck2
  
  benchmark edit-distance-benchmark
    default-language:       Haskell98


=====================================
p/haskell-equivalence/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-equivalence (0.3.4-1) unstable; urgency=medium
+
+  * New upstream release
+  * Do not use "fail" module, should be already in the base ghc package
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 25 Aug 2019 19:43:43 +0200
+
 haskell-equivalence (0.3.2-4) unstable; urgency=medium
 
   * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3)


=====================================
p/haskell-equivalence/debian/patches/drop-fail-dep.patch
=====================================
@@ -0,0 +1,16 @@
+--- haskell-equivalence-0.3.4.orig/equivalence.cabal
++++ haskell-equivalence-0.3.4/equivalence.cabal
+@@ -35,7 +35,7 @@ Test-Suite test
+   hs-source-dirs:	src testsuite/tests
+   Build-Depends:        base >= 4, template-haskell, containers, mtl >= 2.0.1, QuickCheck >= 2,
+                         test-framework, test-framework-quickcheck2, STMonadTrans >= 0.4.3,
+-                        transformers >= 0.2, transformers-compat >= 0.3, fail
++                        transformers >= 0.2, transformers-compat >= 0.3
+ 
+ Library
+   Build-Depends:
+@@ -45,4 +45,3 @@ Library
+     Data.Equivalence.STT,
+     Data.Equivalence.Monad
+   Hs-Source-Dirs: src
+-  build-depends: fail


=====================================
p/haskell-equivalence/debian/patches/series
=====================================
@@ -0,0 +1 @@
+drop-fail-dep.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/0c0a90f4f6bdafaac7a28dfd445fe6dffd985bc7...7b583535446c8aa59517af25d5b331df73d03ba9

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/0c0a90f4f6bdafaac7a28dfd445fe6dffd985bc7...7b583535446c8aa59517af25d5b331df73d03ba9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20190825/b6588dd4/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list