[Git][haskell-team/DHG_packages][master] yaml: Upgrading from 0.8.32 to 0.11.1.0
Clint Adams
gitlab at salsa.debian.org
Fri Aug 2 03:02:05 BST 2019
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f11814db by Clint Adams at 2019-08-02T02:01:32Z
yaml: Upgrading from 0.8.32 to 0.11.1.0
- - - - -
6 changed files:
- p/haskell-yaml/debian/changelog
- p/haskell-yaml/debian/control
- − p/haskell-yaml/debian/patches/fix-system-libyaml
- − p/haskell-yaml/debian/patches/fix-tests-on-32-bit
- − p/haskell-yaml/debian/patches/series
- p/haskell-yaml/debian/rules
Changes:
=====================================
p/haskell-yaml/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-yaml (0.11.1.0-1) unstable; urgency=medium
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Thu, 01 Aug 2019 21:55:48 -0400
+
haskell-yaml (0.8.32-4) unstable; urgency=medium
* Backport upstream patch to fix tests on 32-bit machines
=====================================
p/haskell-yaml/debian/control
=====================================
@@ -19,23 +19,18 @@ Build-Depends:
libghc-conduit-dev (>= 1.2.8),
libghc-conduit-dev (<< 1.4),
libghc-conduit-prof,
- libghc-hunit-dev,
- libghc-hspec-dev (>= 1.3),
- libghc-mockery-dev,
+ libghc-libyaml-dev (>= 0.1),
+ libghc-libyaml-dev (<< 0.2),
+ libghc-libyaml-prof,
libghc-resourcet-dev (>= 0.3),
libghc-resourcet-dev (<< 1.3),
libghc-resourcet-prof,
libghc-scientific-dev,
libghc-scientific-prof,
- libghc-semigroups-dev,
- libghc-semigroups-prof,
- libghc-temporary-dev [!mips !mipsel !mips64el],
libghc-unordered-containers-dev,
libghc-unordered-containers-prof,
libghc-vector-dev,
libghc-vector-prof,
- libyaml-dev,
- pkg-config,
libghc-hunit-dev,
libghc-aeson-dev (>= 0.7),
libghc-base-compat-dev,
@@ -43,17 +38,19 @@ Build-Depends:
libghc-hspec-dev (>= 1.3),
libghc-mockery-dev,
libghc-mockery-prof,
- libghc-temporary-dev,
+ libghc-raw-strings-qq-dev,
+ libghc-raw-strings-qq-prof,
+ libghc-temporary-dev [!mips !mipsel !mips64el],
Build-Depends-Indep: ghc-doc,
libghc-aeson-doc,
libghc-attoparsec-doc,
libghc-conduit-doc,
+ libghc-libyaml-doc,
libghc-resourcet-doc,
libghc-scientific-doc,
- libghc-semigroups-doc,
libghc-unordered-containers-doc,
libghc-vector-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.4.0
Homepage: https://github.com/snoyberg/yaml
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-yaml
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-yaml]
=====================================
p/haskell-yaml/debian/patches/fix-system-libyaml deleted
=====================================
@@ -1,29 +0,0 @@
-From ba216731cd5bf4264e9ad95d55616ff1a9edfac5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail at nh2.me>
-Date: Wed, 29 Aug 2018 12:31:04 +0200
-Subject: [PATCH] Correctly declare libyaml dependency on system-libyaml flag.
-
-Fixes
-
- stack build --extra-include-dirs ... --extra-lib-dirs ...
-
-to set libyaml path being ignored.
-
-Also fixes https://github.com/NixOS/cabal2nix/issues/372#issuecomment-416062945
----
- package.yaml | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-Index: b/yaml.cabal
-===================================================================
---- a/yaml.cabal
-+++ b/yaml.cabal
-@@ -113,6 +113,8 @@ library
- libyaml/reader.c
- libyaml/scanner.c
- libyaml/writer.c
-+ else
-+ extra-libraries: yaml
- if os(windows)
- cpp-options: -DWINDOWS
- default-language: Haskell2010
=====================================
p/haskell-yaml/debian/patches/fix-tests-on-32-bit deleted
=====================================
@@ -1,33 +0,0 @@
-From 256c06dd7ddcd60018d0b02a06f991413fe2d80b Mon Sep 17 00:00:00 2001
-From: Michael Snoyman <michael at snoyman.com>
-Date: Sun, 30 Sep 2018 13:56:46 +0300
-Subject: [PATCH] Use Int64 instead of Int #158
-
----
- ChangeLog.md | 1 +
- test/Data/YamlSpec.hs | 5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-Index: b/test/Data/YamlSpec.hs
-===================================================================
---- a/test/Data/YamlSpec.hs
-+++ b/test/Data/YamlSpec.hs
-@@ -9,6 +9,7 @@ module Data.YamlSpec (main, spec) where
-
- import qualified Text.Libyaml as Y
- import qualified Data.ByteString.Char8 as B8
-+import Data.Int (Int64)
-
- import Test.HUnit hiding (Test, path)
-
-@@ -190,8 +191,8 @@ spec = do
- go "0o123" (83 :: Int)
- go "0xC" (12 :: Int)
- go "0xc" (12 :: Int)
-- go "0xdeadBEEF" (3735928559 :: Int)
-- go "0xDEADBEEF" (3735928559 :: Int)
-+ go "0xdeadBEEF" (3735928559 :: Int64)
-+ go "0xDEADBEEF" (3735928559 :: Int64)
- go "1.23015e+3" (1230.15 :: Scientific)
- go "12.3015e+02" (1230.15 :: Scientific)
- go "1230.15" (1230.15 :: Scientific)
=====================================
p/haskell-yaml/debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-fix-system-libyaml
-fix-tests-on-32-bit
=====================================
p/haskell-yaml/debian/rules
=====================================
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_SETUP_GHC_CONFIGURE_ARGS := --flags="system-libyaml -no-exe"
+DEB_SETUP_GHC_CONFIGURE_ARGS := --flags="-no-exe"
# The test suite requires template haskell
ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/f11814db93bf4bda1c226f33f01500846c095a65
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/f11814db93bf4bda1c226f33f01500846c095a65
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/20190802/1514627a/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list