[Git][haskell-team/DHG_packages][master] hackage-security: bpb

[Clint Adams (@clint)]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
f42bda0c by Clint Adams at 2022-07-27T17:55:07-04:00
hackage-security: bpb

- - - - -


2 changed files:

- p/haskell-hackage-security/debian/changelog
- p/haskell-hackage-security/debian/patches/newer-deps


Changes:

=====================================
p/haskell-hackage-security/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hackage-security (0.6.2.1-3) unstable; urgency=medium
+
+  * Fix ptch.
+
+ -- Clint Adams <clint at debian.org>  Wed, 27 Jul 2022 17:54:47 -0400
+
 haskell-hackage-security (0.6.2.1-2) unstable; urgency=medium
 
   * Patch for newer dependencies.


=====================================
p/haskell-hackage-security/debian/patches/newer-deps
=====================================
@@ -9,18 +9,27 @@
                         base16-bytestring >= 0.1.1   && < 1.1,
                         base64-bytestring >= 1.0     && < 1.3,
                         bytestring        >= 0.9     && < 0.12,
-@@ -132,6 +132,10 @@ library
+@@ -132,13 +132,13 @@ library
                         time              >= 1.2     && < 1.13,
                         transformers      >= 0.3     && < 0.6,
                         zlib              >= 0.5     && < 0.7,
 +                       network-uri >= 2.6 && < 2.7,
 +                       network     >= 2.6 && < 2.9
-+                                || >= 3.0 && < 3.2
++                                || >= 3.0 && < 3.2,
 +
                         -- whatever versions are bundled with ghc:
-                        ghc-prim
-   if flag(old-directory)
-@@ -156,8 +160,7 @@ library
+-                       ghc-prim
+-  if flag(old-directory)
+-    build-depends:     directory  >= 1.1.0.2 && < 1.2,
+-                       old-time   >= 1 &&       < 1.2
+-  else
+-    build-depends:     directory  >= 1.2 && < 1.4
++                       ghc-prim,
++                       directory  >= 1.2 && < 1.4
+ 
+   if flag(mtl21)
+     build-depends:     mtl        >= 2.1     && < 2.2,
+@@ -156,8 +156,7 @@ library
    else
      build-depends: Cabal        >= 1.14    && < 1.26
                               || >= 2.0     && < 2.6
@@ -30,7 +39,7 @@
  
    hs-source-dirs:      src
    default-language:    Haskell2010
-@@ -195,11 +198,6 @@ library
+@@ -195,11 +194,6 @@ library
  
    ghc-options:         -Wall
  
@@ -42,7 +51,7 @@
    -- The URI type got split out off the network package after version 2.5, and
    -- moved to a separate network-uri package. Since we don't need the rest of
    -- network here, it would suffice to rely only on network-uri:
-@@ -232,12 +230,6 @@ library
+@@ -232,12 +226,6 @@ library
    -- network in the other branch forces the choice to be consistent throughout.
    -- (Note that the HTTP library does the same thing, though in this case the
    -- dependency in network is not redundant.)



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f42bda0c05dbd617b99572985f3254e7f233dc5c

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f42bda0c05dbd617b99572985f3254e7f233dc5c
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/20220727/28a43295/attachment-0001.htm>