[Git][haskell-team/DHG_packages][master] 3 commits: prettyprinter-ansi-terminal: Don't build test executables with RTS -N
Ilias Tsitsimpis
gitlab at salsa.debian.org
Wed Oct 17 10:46:59 BST 2018
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
907ec701 by Ilias Tsitsimpis at 2018-10-17T09:09:29Z
prettyprinter-ansi-terminal: Don't build test executables with RTS -N
- - - - -
013a493f by Ilias Tsitsimpis at 2018-10-17T09:24:32Z
integer-logarithms: Relax build-dependency on libghc-tasty-dev
- - - - -
282b98c8 by Ilias Tsitsimpis at 2018-10-17T09:40:08Z
blaze-markup: New deps
- - - - -
12 changed files:
- p/haskell-blaze-markup/debian/changelog
- p/haskell-blaze-markup/debian/control
- + p/haskell-blaze-markup/debian/patches/newer-deps
- − p/haskell-blaze-markup/debian/patches/older-tasty-quickcheck
- p/haskell-blaze-markup/debian/patches/series
- p/haskell-integer-logarithms/debian/changelog
- p/haskell-integer-logarithms/debian/control
- p/haskell-integer-logarithms/debian/copyright
- p/haskell-integer-logarithms/debian/rules
- p/haskell-prettyprinter-ansi-terminal/debian/changelog
- + p/haskell-prettyprinter-ansi-terminal/debian/patches/rtsopts_remove_N
- + p/haskell-prettyprinter-ansi-terminal/debian/patches/series
Changes:
=====================================
p/haskell-blaze-markup/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-blaze-markup (0.8.2.1-4) unstable; urgency=medium
+
+ * Backport upstream patch to relax constraints on base,
+ containers, and tasty.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 17 Oct 2018 12:39:58 +0300
+
haskell-blaze-markup (0.8.2.1-3) unstable; urgency=medium
* Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)
=====================================
p/haskell-blaze-markup/debian/control
=====================================
@@ -21,7 +21,7 @@ Build-Depends:
libghc-quickcheck2-dev (<< 2.12),
libghc-quickcheck2-prof,
libghc-tasty-dev (>= 1.0),
- libghc-tasty-dev (<< 1.1),
+ libghc-tasty-dev (<< 1.2),
libghc-tasty-prof,
libghc-tasty-hunit-dev (>= 0.10),
libghc-tasty-hunit-dev (<< 0.11),
=====================================
p/haskell-blaze-markup/debian/patches/newer-deps
=====================================
@@ -0,0 +1,38 @@
+From 57af819ead3b4e4570887b0e9134787b88c1e673 Mon Sep 17 00:00:00 2001
+From: Dan Burton <danburton.email at gmail.com>
+Date: Tue, 25 Sep 2018 07:26:12 -0700
+Subject: [PATCH] Relax constraints on base, containers, and tasty for ghc 8.6
+
+---
+ blaze-markup.cabal | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: b/blaze-markup.cabal
+===================================================================
+--- a/blaze-markup.cabal
++++ b/blaze-markup.cabal
+@@ -36,7 +36,7 @@ Library
+ Text.Blaze.Renderer.Utf8
+
+ Build-depends:
+- base >= 4 && < 4.12,
++ base >= 4 && < 4.13,
+ blaze-builder >= 0.3 && < 0.5,
+ text >= 0.10 && < 1.3,
+ bytestring >= 0.9 && < 0.11
+@@ -60,12 +60,12 @@ Test-suite blaze-markup-tests
+ Build-depends:
+ HUnit >= 1.2 && < 1.7,
+ QuickCheck >= 2.7 && < 2.12,
+- containers >= 0.3 && < 0.6,
+- tasty >= 1.0 && < 1.1,
++ containers >= 0.3 && < 0.7,
++ tasty >= 1.0 && < 1.2,
+ tasty-hunit >= 0.10 && < 0.11,
+ tasty-quickcheck >= 0.10 && < 0.11,
+ -- Copied from regular dependencies...
+- base >= 4 && < 4.12,
++ base >= 4 && < 4.13,
+ blaze-builder >= 0.3 && < 0.5,
+ text >= 0.10 && < 1.3,
+ bytestring >= 0.9 && < 0.11
=====================================
p/haskell-blaze-markup/debian/patches/older-tasty-quickcheck deleted
=====================================
@@ -1,11 +0,0 @@
---- a/blaze-markup.cabal
-+++ b/blaze-markup.cabal
-@@ -63,7 +63,7 @@
- containers >= 0.3 && < 0.6,
- tasty >= 1.0 && < 1.1,
- tasty-hunit >= 0.10 && < 0.11,
-- tasty-quickcheck >= 0.10 && < 0.11,
-+ tasty-quickcheck >= 0.9 && < 0.11,
- -- Copied from regular dependencies...
- base >= 4 && < 4.12,
- blaze-builder >= 0.3 && < 0.5,
=====================================
p/haskell-blaze-markup/debian/patches/series
=====================================
@@ -1 +1 @@
-older-tasty-quickcheck
+newer-deps
=====================================
p/haskell-integer-logarithms/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-integer-logarithms (1.0.2.2-2) unstable; urgency=medium
+
+ * Relax build-dependency on libghc-tasty-dev
+ * Re-enable tests
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 17 Oct 2018 12:20:28 +0300
+
haskell-integer-logarithms (1.0.2.2-1) unstable; urgency=medium
[ Clint Adams ]
=====================================
p/haskell-integer-logarithms/debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 10),
libghc-smallcheck-dev (>= 1.1.3),
libghc-smallcheck-dev (<< 1.2),
libghc-tasty-dev (>= 0.10),
- libghc-tasty-dev (<< 1.1),
+ libghc-tasty-dev (<< 1.2),
libghc-tasty-hunit-dev (>= 0.9),
libghc-tasty-hunit-dev (<< 0.11),
libghc-tasty-quickcheck-dev (>= 0.8),
@@ -25,7 +25,7 @@ Build-Depends-Indep: ghc-doc,
Standards-Version: 4.1.4
Homepage: https://github.com/Bodigrim/integer-logarithms
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-integer-logarithms
-Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
+Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-integer-logarithms]
X-Description: integer logarithms
Math.NumberTheory.Logarithms and Math.NumberTheory.Powers.Integer
from the arithmoi package.
=====================================
p/haskell-integer-logarithms/debian/copyright
=====================================
@@ -5,16 +5,10 @@ Source: https://hackage.haskell.org/package/integer-logarithms
Files: *
Copyright: 2011-2014 Daniel Fischer
+ 2016 Andrew Lelechenko
2017 Oleg Grenrus
License: Expat
-Files: test-suite/Math/NumberTheory/TestUtils.hs
- test-suite/Math/NumberTheory/Powers/IntegerTests.hs
- test-suite/Math/NumberTheory/Powers/NaturalTests.hs
- test-suite/Math/NumberTheory/LogarithmsTests.hs
-Copyright: 2016 Andrew Lelechenko
-License: Expat
-
Files: debian/*
Copyright: held by the contributors mentioned in debian/changelog
License: Expat
=====================================
p/haskell-integer-logarithms/debian/rules
=====================================
@@ -1,10 +1,6 @@
#!/usr/bin/make -f
-# needs QuickCheck 2.10 which is newer than current LTS
-DEB_ENABLE_TESTS = no
-DEB_SETUP_BIN_NAME = debian/hlibrary.setup
-DEB_CABAL_PACKAGE = integer-logarithms
-DEB_DEFAULT_COMPILER = ghc
+DEB_ENABLE_TESTS = yes
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-prettyprinter-ansi-terminal/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-prettyprinter-ansi-terminal (1.1.1.2-4) unstable; urgency=medium
+
+ * Don't build test executables with RTS -N; most of Debian's
+ architectures lack SMP support.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 17 Oct 2018 12:09:19 +0300
+
haskell-prettyprinter-ansi-terminal (1.1.1.2-3) unstable; urgency=medium
* Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)
=====================================
p/haskell-prettyprinter-ansi-terminal/debian/patches/rtsopts_remove_N
=====================================
@@ -0,0 +1,13 @@
+Index: b/prettyprinter-ansi-terminal.cabal
+===================================================================
+--- a/prettyprinter-ansi-terminal.cabal
++++ b/prettyprinter-ansi-terminal.cabal
+@@ -51,7 +51,7 @@ test-suite doctest
+ build-depends:
+ base >= 4.7 && < 5
+ , doctest >= 0.9
+- ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
++ ghc-options: -Wall -threaded
+ default-language: Haskell2010
+ if impl (ghc < 7.10)
+ buildable: False
=====================================
p/haskell-prettyprinter-ansi-terminal/debian/patches/series
=====================================
@@ -0,0 +1 @@
+rtsopts_remove_N
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/0acc16d9746d41601415bbd441e74a86c96ab1f4...282b98c88e8cfabf730fe3d0b60079f1de79e094
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/0acc16d9746d41601415bbd441e74a86c96ab1f4...282b98c88e8cfabf730fe3d0b60079f1de79e094
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/20181017/9e482dc6/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list