[Git][haskell-team/DHG_packages][master] 4 commits: active: Drop 'newer-deps' patch

Ilias Tsitsimpis gitlab at salsa.debian.org
Sun Jun 14 15:40:32 BST 2020



Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
31985a02 by Ilias Tsitsimpis at 2020-06-14T17:40:14+03:00
active: Drop 'newer-deps' patch

- - - - -
0d2c5d82 by Ilias Tsitsimpis at 2020-06-14T17:40:15+03:00
aeson-compat: Patch for newer deps

- - - - -
050b742c by Ilias Tsitsimpis at 2020-06-14T17:40:15+03:00
argon2: Patch for newer deps

- - - - -
d738a9dd by Ilias Tsitsimpis at 2020-06-14T17:40:15+03:00
bencode: Bump Standards-Version to 4.5.0

- - - - -


12 changed files:

- p/haskell-active/debian/changelog
- p/haskell-active/debian/control
- − p/haskell-active/debian/patches/newer-deps
- − p/haskell-active/debian/patches/series
- p/haskell-aeson-compat/debian/changelog
- p/haskell-aeson-compat/debian/control
- p/haskell-aeson-compat/debian/patches/newer-deps
- p/haskell-argon2/debian/changelog
- p/haskell-argon2/debian/control
- p/haskell-argon2/debian/patches/newer-deps
- p/haskell-bencode/debian/changelog
- p/haskell-bencode/debian/control


Changes:

=====================================
p/haskell-active/debian/changelog
=====================================
@@ -1,8 +1,13 @@
 haskell-active (0.2.0.14-1) unstable; urgency=medium
 
+  [ Sean Whitton ]
   * New upstream release
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Tue, 26 May 2020 09:27:24 -0700
+  [ Ilias Tsitsimpis ]
+  * Bump Standards-Version to 4.5.0
+  * Drop 'newer-deps' patch
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 14 Jun 2020 17:10:04 +0300
 
 haskell-active (0.2.0.13-7) unstable; urgency=medium
 


=====================================
p/haskell-active/debian/control
=====================================
@@ -34,7 +34,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-semigroupoids-doc,
  libghc-semigroups-doc,
  libghc-vector-doc,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Homepage: https://hackage.haskell.org/package/active
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-active
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-active]


=====================================
p/haskell-active/debian/patches/newer-deps deleted
=====================================
@@ -1,35 +0,0 @@
---- a/active.cabal
-+++ b/active.cabal
-@@ -20,11 +20,11 @@
- 
- library
-   exposed-modules:     Data.Active
--  build-depends:       base >= 4.0 && < 4.11,
-+  build-depends:       base >= 4.0 && < 5,
-                        vector >= 0.10,
-                        semigroups >= 0.1 && < 0.19,
--                       semigroupoids >= 1.2 && < 5.3,
--                       lens >= 4.0 && < 4.16,
-+                       semigroupoids >= 1.2 && < 5.4,
-+                       lens >= 4.0 && < 4.18,
-                        linear >= 1.14 && < 1.21
-   hs-source-dirs:      src
-   default-language:    Haskell2010
-@@ -32,13 +32,13 @@
- test-suite active-tests
-     type:              exitcode-stdio-1.0
-     main-is:           active-tests.hs
--    build-depends:     base >= 4.0 && < 4.10,
-+    build-depends:     base >= 4.0 && < 5,
-                        vector >= 0.10,
-                        semigroups >= 0.1 && < 0.19,
--                       semigroupoids >= 1.2 && < 5.3,
--                       lens >= 4.0 && < 4.16,
-+                       semigroupoids >= 1.2 && < 5.4,
-+                       lens >= 4.0 && < 4.18,
-                        linear >= 1.14 && < 1.21,
--                       QuickCheck >= 2.9 && < 2.10
-+                       QuickCheck >= 2.9 && < 2.13
-     other-modules:     Data.Active
-     hs-source-dirs:    src, test
-     default-language:  Haskell2010


=====================================
p/haskell-active/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-newer-deps


=====================================
p/haskell-aeson-compat/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-aeson-compat (0.3.9-3) unstable; urgency=medium
+
+  * Patch for newer deps
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 14 Jun 2020 17:10:58 +0300
+
 haskell-aeson-compat (0.3.9-2) unstable; urgency=medium
 
   * Fix upper bound on base-orphans.


=====================================
p/haskell-aeson-compat/debian/control
=====================================
@@ -12,66 +12,93 @@ Build-Depends:
  ghc-prof,
  haskell-devscripts (>= 0.13),
  libghc-aeson-dev (>= 0.7.0.6),
- libghc-aeson-dev (<< 1.5),
- libghc-aeson-prof,
+ libghc-aeson-dev (<< 1.6),
+ libghc-aeson-prof (>= 0.7.0.6),
+ libghc-aeson-prof (<< 1.6),
  libghc-attoparsec-dev (>= 0.12),
  libghc-attoparsec-dev (<< 0.14),
- libghc-attoparsec-prof,
+ libghc-attoparsec-prof (>= 0.12),
+ libghc-attoparsec-prof (<< 0.14),
  libghc-attoparsec-iso8601-dev (>= 1.0.0.0),
  libghc-attoparsec-iso8601-dev (<< 1.1),
- libghc-attoparsec-iso8601-prof,
+ libghc-attoparsec-iso8601-prof (>= 1.0.0.0),
+ libghc-attoparsec-iso8601-prof (<< 1.1),
  libghc-base-compat-dev (>= 0.6.0),
- libghc-base-compat-dev (<< 0.11),
- libghc-base-compat-prof,
- libghc-base-orphans-dev (>= 0.4.5),
- libghc-base-orphans-dev (<< 0.9),
+ libghc-base-compat-dev (<< 0.12),
+ libghc-base-compat-prof (>= 0.6.0),
+ libghc-base-compat-prof (<< 0.12),
  libghc-exceptions-dev (>= 0.8),
  libghc-exceptions-dev (<< 0.11),
- libghc-exceptions-prof,
+ libghc-exceptions-prof (>= 0.8),
+ libghc-exceptions-prof (<< 0.11),
  libghc-hashable-dev (>= 1.2),
  libghc-hashable-dev (<< 1.4),
- libghc-hashable-prof,
+ libghc-hashable-prof (>= 1.2),
+ libghc-hashable-prof (<< 1.4),
  libghc-scientific-dev (>= 0.3),
  libghc-scientific-dev (<< 0.4),
- libghc-scientific-prof,
+ libghc-scientific-prof (>= 0.3),
+ libghc-scientific-prof (<< 0.4),
  libghc-tagged-dev (>= 0.7.3),
  libghc-tagged-dev (<< 0.9),
- libghc-tagged-prof,
+ libghc-tagged-prof (>= 0.7.3),
+ libghc-tagged-prof (<< 0.9),
  libghc-time-locale-compat-dev (>= 0.1.0.1),
  libghc-time-locale-compat-dev (<< 0.2),
- libghc-time-locale-compat-prof,
+ libghc-time-locale-compat-prof (>= 0.1.0.1),
+ libghc-time-locale-compat-prof (<< 0.2),
  libghc-unordered-containers-dev (>= 0.2),
  libghc-unordered-containers-dev (<< 0.3),
- libghc-unordered-containers-prof,
+ libghc-unordered-containers-prof (>= 0.2),
+ libghc-unordered-containers-prof (<< 0.3),
  libghc-vector-dev (>= 0.10),
  libghc-vector-dev (<< 0.13),
- libghc-vector-prof,
+ libghc-vector-prof (>= 0.10),
+ libghc-vector-prof (<< 0.13),
  libghc-quickcheck2-dev (>= 2.10),
- libghc-quickcheck2-dev (<< 2.14),
- libghc-quickcheck2-prof,
+ libghc-quickcheck2-dev (<< 2.15),
+ libghc-quickcheck2-prof (>= 2.10),
+ libghc-quickcheck2-prof (<< 2.15),
  libghc-aeson-dev,
+ libghc-aeson-prof,
  libghc-attoparsec-dev,
+ libghc-attoparsec-prof,
  libghc-base-compat-dev,
+ libghc-base-compat-prof,
  libghc-base-orphans-dev (>= 0.4.5),
  libghc-base-orphans-dev (<< 0.9),
- libghc-base-orphans-prof,
+ libghc-base-orphans-prof (>= 0.4.5),
+ libghc-base-orphans-prof (<< 0.9),
  libghc-exceptions-dev,
+ libghc-exceptions-prof,
  libghc-hashable-dev,
+ libghc-hashable-prof,
  libghc-quickcheck-instances-dev (>= 0.3.16),
  libghc-quickcheck-instances-dev (<< 0.4),
+ libghc-quickcheck-instances-prof (>= 0.3.16),
+ libghc-quickcheck-instances-prof (<< 0.4),
  libghc-scientific-dev,
+ libghc-scientific-prof,
  libghc-tagged-dev,
+ libghc-tagged-prof,
  libghc-tasty-dev (>= 0.10),
  libghc-tasty-dev (<< 1.3),
- libghc-tasty-prof,
+ libghc-tasty-prof (>= 0.10),
+ libghc-tasty-prof (<< 1.3),
  libghc-tasty-hunit-dev (>= 0.9),
  libghc-tasty-hunit-dev (<< 0.11),
- libghc-tasty-hunit-prof,
+ libghc-tasty-hunit-prof (>= 0.9),
+ libghc-tasty-hunit-prof (<< 0.11),
  libghc-tasty-quickcheck-dev (>= 0.8),
  libghc-tasty-quickcheck-dev (<< 0.11),
- libghc-tasty-quickcheck-prof,
+ libghc-tasty-quickcheck-prof (>= 0.8),
+ libghc-tasty-quickcheck-prof (<< 0.11),
  libghc-time-locale-compat-dev,
+ libghc-time-locale-compat-prof,
  libghc-unordered-containers-dev,
+ libghc-unordered-containers-prof,
+ libghc-vector-dev,
+ libghc-vector-prof,
 Build-Depends-Indep: ghc-doc,
  libghc-aeson-doc,
  libghc-attoparsec-doc,
@@ -84,7 +111,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-time-locale-compat-doc,
  libghc-unordered-containers-doc,
  libghc-vector-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: https://github.com/phadej/aeson-compat#readme
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-aeson-compat]
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-aeson-compat


=====================================
p/haskell-aeson-compat/debian/patches/newer-deps
=====================================
@@ -1,33 +1,174 @@
+Index: b/aeson-compat.cabal
+===================================================================
 --- a/aeson-compat.cabal
 +++ b/aeson-compat.cabal
-@@ -41,7 +41,7 @@
-     , bytestring               >=0.10 && <0.11
-     , containers               >=0.5  && <0.7
-     , exceptions               >=0.8  && <0.11
+@@ -1,101 +1,103 @@
+-name:           aeson-compat
+-version:        0.3.9
+-synopsis:       Compatibility layer for aeson
+-description:    Compatibility layer for @aeson@
+-category:       Web
+-homepage:       https://github.com/phadej/aeson-compat#readme
+-bug-reports:    https://github.com/phadej/aeson-compat/issues
+-author:         Oleg Grenrus <oleg.grenrus at iki.fi>
+-maintainer:     Oleg Grenrus <oleg.grenrus at iki.fi>
+-license:        BSD3
+-license-file:   LICENSE
+-build-type:     Simple
+-cabal-version:  >= 1.10
++name:               aeson-compat
++version:            0.3.9
++x-revision:         4
++synopsis:           Compatibility layer for aeson
++description:        Compatibility layer for @aeson@
++category:           Web
++homepage:           https://github.com/phadej/aeson-compat#readme
++bug-reports:        https://github.com/phadej/aeson-compat/issues
++author:             Oleg Grenrus <oleg.grenrus at iki.fi>
++maintainer:         Oleg Grenrus <oleg.grenrus at iki.fi>
++license:            BSD3
++license-file:       LICENSE
++build-type:         Simple
++cabal-version:      >=1.10
+ tested-with:
+   GHC ==7.6.3
+    || ==7.8.4
+    || ==7.10.3
+    || ==8.0.2
+    || ==8.2.2
+-   || ==8.4.3
+-   || ==8.6.1
++   || ==8.4.4
++   || ==8.6.5
++   || ==8.8.3
++   || ==8.10.1
+ 
+ extra-source-files:
+-    CHANGELOG.md
+-    README.md
++  CHANGELOG.md
++  README.md
+ 
+ source-repository head
+-  type: git
++  type:     git
+   location: https://github.com/phadej/aeson-compat
+ 
+ library
+-  hs-source-dirs:
+-      src
+-  ghc-options: -Wall
++  hs-source-dirs:   src
++  ghc-options:      -Wall
+   build-depends:
+-      base                     >=4.6  && <4.13
+-    , base-compat              >=0.6.0 && <0.11
+-    , aeson                    >=0.7.0.6 && <1.5
+-    , attoparsec               >=0.12 && <0.14
+-    , attoparsec-iso8601       >=1.0.0.0 && <1.1
+-    , bytestring               >=0.10 && <0.11
+-    , containers               >=0.5  && <0.7
+-    , exceptions               >=0.8  && <0.11
 -    , hashable                 >=1.2  && <1.3
-+    , hashable                 >=1.2  && <1.4
-     , scientific               >=0.3  && <0.4
-     , text                     >=1.2  && <1.3
-     , time                     >=1.4.0.1 && <1.9
-@@ -52,7 +52,7 @@
+-    , scientific               >=0.3  && <0.4
+-    , text                     >=1.2  && <1.3
+-    , time                     >=1.4.0.1 && <1.9
+-    , time-locale-compat       >=0.1.0.1 && <0.2
+-    , unordered-containers     >=0.2  && <0.3
+-    , vector                   >=0.10 && <0.13
+-    , tagged                   >=0.7.3 && <0.9
++      aeson                 >=0.7.0.6 && <1.6
++    , attoparsec            >=0.12    && <0.14
++    , attoparsec-iso8601    >=1.0.0.0 && <1.1
++    , base                  >=4.6     && <4.15
++    , base-compat           >=0.6.0   && <0.12
++    , bytestring            >=0.10    && <0.11
++    , containers            >=0.5     && <0.7
++    , exceptions            >=0.8     && <0.11
++    , hashable              >=1.2     && <1.4
++    , scientific            >=0.3     && <0.4
++    , tagged                >=0.7.3   && <0.9
++    , text                  >=1.2     && <1.3
++    , time                  >=1.4.0.1 && <1.10
++    , time-locale-compat    >=0.1.0.1 && <0.2
++    , unordered-containers  >=0.2     && <0.3
++    , vector                >=0.10    && <0.13
  
-   if !impl(ghc >= 8.0)
-     build-depends:
+-  if !impl(ghc >= 8.0)
+-    build-depends:
 -      semigroups               >=0.18.5 && <0.19
-+      semigroups               >=0.18.5 && <0.20
-   if !impl(ghc >= 7.10)
+-  if !impl(ghc >= 7.10)
++  if !impl(ghc >=8.0)
++    build-depends: semigroups >=0.18.5 && <0.20
++
++  if !impl(ghc >=7.10)
      build-depends:
-       nats                     >=1.1.2  && <1.2,
-@@ -86,10 +86,10 @@
-     , tagged
-     , aeson-compat
-     , base-orphans          >=0.4.5 && <0.9
+-      nats                     >=1.1.2  && <1.2,
+-      void                     >=0.7.2  && <0.8
++        nats  >=1.1.2 && <1.2
++      , void  >=0.7.2 && <0.8
+ 
+-  exposed-modules:
+-      Data.Aeson.Compat
++  exposed-modules:  Data.Aeson.Compat
+   default-language: Haskell2010
+ 
+ test-suite aeson-compat-test
+-  type: exitcode-stdio-1.0
+-  main-is: Tests.hs
+-  hs-source-dirs:
+-      test
+-  ghc-options: -Wall
++  type:             exitcode-stdio-1.0
++  main-is:          Tests.hs
++  hs-source-dirs:   test
++  ghc-options:      -Wall
+   build-depends:
+-      base
+-    , base-compat
+-    , aeson
++      aeson
++    , aeson-compat
+     , attoparsec
++    , base
++    , base-compat
++    , base-orphans          >=0.4.5  && <0.9
+     , bytestring
+     , containers
+     , exceptions
+     , hashable
++    , QuickCheck            >=2.10   && <2.15
++    , quickcheck-instances  >=0.3.16 && <0.4
+     , scientific
++    , tagged
++    , tasty                 >=0.10   && <1.3
++    , tasty-hunit           >=0.9    && <0.11
++    , tasty-quickcheck      >=0.8    && <0.11
+     , text
+     , time
+     , time-locale-compat
+     , unordered-containers
+     , vector
+-    , tagged
+-    , aeson-compat
+-    , base-orphans          >=0.4.5 && <0.9
 -    , tasty                 >=0.10 && <1.2
-+    , tasty                 >=0.10 && <1.3
-     , tasty-hunit           >=0.9  && <0.11
-     , tasty-quickcheck      >=0.8  && <0.11
+-    , tasty-hunit           >=0.9  && <0.11
+-    , tasty-quickcheck      >=0.8  && <0.11
 -    , QuickCheck            >=2.10 && <2.13
-+    , QuickCheck            >=2.10 && <2.14
-     , quickcheck-instances  >=0.3.16  && <0.4
+-    , quickcheck-instances  >=0.3.16  && <0.4
  
-   if !impl(ghc >= 8.0)
+-  if !impl(ghc >= 8.0)
+-    build-depends:
+-      semigroups
+-  if !impl(ghc >= 7.10)
++  if !impl(ghc >=8.0)
++    build-depends: semigroups
++
++  if !impl(ghc >=7.10)
+     build-depends:
+-      nats, void
++        nats
++      , void
++
+   default-language: Haskell2010


=====================================
p/haskell-argon2/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-argon2 (1.3.0.1-7) unstable; urgency=medium
+
+  * Patch for newer deps
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 14 Jun 2020 17:21:04 +0300
+
 haskell-argon2 (1.3.0.1-6) unstable; urgency=medium
 
   * Bump dependency bounds


=====================================
p/haskell-argon2/debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
  libghc-text-short-prof,
 Build-Depends-Indep: ghc-doc,
  libghc-text-short-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: https://github.com/ocharles/argon2.git
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-argon2
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-argon2]


=====================================
p/haskell-argon2/debian/patches/newer-deps
=====================================
@@ -1,11 +1,21 @@
---- haskell-argon2-1.3.0.1.orig/argon2.cabal
-+++ haskell-argon2-1.3.0.1/argon2.cabal
-@@ -66,7 +66,7 @@ library
+Index: b/argon2.cabal
+===================================================================
+--- a/argon2.cabal
++++ b/argon2.cabal
+@@ -1,6 +1,7 @@
+ cabal-version:       1.22
+ name:                argon2
+ version:             1.3.0.1
++x-revision: 2
+ 
+ synopsis:            Memory-hard password hash and proof-of-work function
+ description:
+@@ -66,7 +67,7 @@ library
    exposed-modules:     Crypto.Argon2.FFI
                         Crypto.Argon2
  
 -  build-depends:       base         >= 4.8   && < 4.12
-+  build-depends:       base         >= 4.8   && < 4.13
++  build-depends:       base         >= 4.8   && < 4.14
                       , bytestring   == 0.10.*
                       , deepseq      == 1.4.*
                       , text-short   >= 0.1.2 && < 0.2


=====================================
p/haskell-bencode/debian/changelog
=====================================
@@ -1,8 +1,12 @@
 haskell-bencode (0.6.1.1-1) unstable; urgency=medium
 
+  [ Sean Whitton ]
   * New upstream release
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Tue, 26 May 2020 09:38:01 -0700
+  [ Ilias Tsitsimpis ]
+  * Bump Standards-Version to 4.5.0
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 14 Jun 2020 17:22:02 +0300
 
 haskell-bencode (0.6.0.0-7) unstable; urgency=medium
 


=====================================
p/haskell-bencode/debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
  libghc-transformers-compat-prof,
 Build-Depends-Indep: ghc-doc,
  libghc-transformers-compat-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: http://hackage.haskell.org/package/bencode
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-bencode
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-bencode]



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/13b69b3168e15dbffb51f150b05b2af57a1ca080...d738a9dd66b59227dcce0032ba2395dc0f76c205

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/13b69b3168e15dbffb51f150b05b2af57a1ca080...d738a9dd66b59227dcce0032ba2395dc0f76c205
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/20200614/681bb679/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list