[Git][haskell-team/DHG_packages][master] hackage-security: Upgrading from 0.6.2.1 to 0.6.2.2
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Sun Oct 23 17:40:58 BST 2022
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f5ac5e94 by Ilias Tsitsimpis at 2022-10-23T19:39:09+03:00
hackage-security: Upgrading from 0.6.2.1 to 0.6.2.2
- - - - -
5 changed files:
- p/haskell-hackage-security/debian/changelog
- − p/haskell-hackage-security/debian/patches/newer-deps
- + p/haskell-hackage-security/debian/patches/no-cabal-syntax
- p/haskell-hackage-security/debian/patches/series
- p/haskell-hackage-security/debian/rules
Changes:
=====================================
p/haskell-hackage-security/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hackage-security (0.6.2.2-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 23 Oct 2022 19:27:49 +0300
+
haskell-hackage-security (0.6.2.1-3) unstable; urgency=medium
* Fix ptch.
=====================================
p/haskell-hackage-security/debian/patches/newer-deps deleted
=====================================
@@ -1,66 +0,0 @@
---- a/hackage-security.cabal
-+++ b/hackage-security.cabal
-@@ -115,7 +115,7 @@ library
- Hackage.Security.Util.TypedEmbedded
- MyPrelude
- -- We support ghc 7.4 (bundled with Cabal 1.14) and up
-- build-depends: base >= 4.5 && < 4.16,
-+ build-depends: base >= 4.5 && < 4.17,
- base16-bytestring >= 0.1.1 && < 1.1,
- base64-bytestring >= 1.0 && < 1.3,
- bytestring >= 0.9 && < 0.12,
-@@ -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,
-+
- -- whatever versions are bundled with ghc:
-- 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
-- || >= 3.0 && < 3.7,
-- Cabal-syntax < 3.7
-+ || >= 3.0 && < 3.7
-
- hs-source-dirs: src
- default-language: Haskell2010
-@@ -195,11 +194,6 @@ library
-
- ghc-options: -Wall
-
-- if flag(base48)
-- build-depends: base >= 4.8
-- else
-- build-depends: base < 4.8, old-locale == 1.0.*
--
- -- 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 +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.)
-- if flag(use-network-uri)
-- build-depends: network-uri >= 2.6 && < 2.7,
-- network >= 2.6 && < 2.9
-- || >= 3.0 && < 3.2
-- else
-- build-depends: network >= 2.5 && < 2.6
-
- if impl(ghc >= 7.8)
- other-extensions: RoleAnnotations
=====================================
p/haskell-hackage-security/debian/patches/no-cabal-syntax
=====================================
@@ -0,0 +1,24 @@
+Index: b/hackage-security.cabal
+===================================================================
+--- a/hackage-security.cabal
++++ b/hackage-security.cabal
+@@ -158,8 +158,7 @@ library
+ else
+ build-depends: Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+- || >= 3.0 && < 3.7,
+- Cabal-syntax < 3.7
++ || >= 3.0 && < 3.7
+
+ hs-source-dirs: src
+ default-language: Haskell2010
+@@ -276,8 +275,7 @@ test-suite TestSuite
+ else
+ build-depends: Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+- || >= 3.0 && < 3.7,
+- Cabal-syntax < 3.7
++ || >= 3.0 && < 3.7
+
+ -- dependencies exclusive to test-suite
+ build-depends: tasty >= 1.2 && < 1.5,
=====================================
p/haskell-hackage-security/debian/patches/series
=====================================
@@ -1 +1 @@
-newer-deps
+no-cabal-syntax
=====================================
p/haskell-hackage-security/debian/rules
=====================================
@@ -3,7 +3,7 @@
DEB_ENABLE_TESTS = yes
DEB_CABAL_PACKAGE = hackage-security
DEB_DEFAULT_COMPILER = ghc
-DEB_SETUP_GHC_CONFIGURE_ARGS := --flags=-lukko
+DEB_SETUP_GHC_CONFIGURE_ARGS := --flags="-lukko +base64 +use-network-uri"
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f5ac5e94933b770523b4eac069b1c209e162aae4
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f5ac5e94933b770523b4eac069b1c209e162aae4
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/20221023/2a7b3cf2/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list