[Git][haskell-team/DHG_packages][master] trifecta: Add missing build dependency on libghc-cabal-doctest-dev

[Ilias Tsitsimpis]

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


Commits:
1acb66ab by Ilias Tsitsimpis at 2018-06-12T15:31:21+03:00
trifecta: Add missing build dependency on libghc-cabal-doctest-dev

- - - - -


3 changed files:

- p/haskell-trifecta/debian/changelog
- p/haskell-trifecta/debian/control
- p/haskell-trifecta/debian/rules


Changes:

=====================================
p/haskell-trifecta/debian/changelog
=====================================
--- a/p/haskell-trifecta/debian/changelog
+++ b/p/haskell-trifecta/debian/changelog
@@ -1,8 +1,13 @@
-haskell-trifecta (1.7.1.1-3) UNRELEASED; urgency=medium
+haskell-trifecta (1.7.1.1-3) unstable; urgency=medium
 
+  [ Clint Adams ]
   * Set Rules-Requires-Root to no.
 
- -- Clint Adams <clint at debian.org>  Sun, 06 May 2018 22:10:47 -0400
+  [ Ilias Tsitsimpis ]
+  * Add missing build dependency on libghc-cabal-doctest-dev (Closes: #897514)
+  * Disable doctests on armel
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 12 Jun 2018 15:21:11 +0300
 
 haskell-trifecta (1.7.1.1-2) unstable; urgency=medium
 


=====================================
p/haskell-trifecta/debian/control
=====================================
--- a/p/haskell-trifecta/debian/control
+++ b/p/haskell-trifecta/debian/control
@@ -68,6 +68,8 @@ Build-Depends:
  libghc-doctest-dev (>= 0.11.1),
  libghc-doctest-dev (<< 0.16),
  libghc-parsers-dev,
+ libghc-cabal-doctest-dev (>= 1),
+ libghc-cabal-doctest-dev (<< 1.1),
 Build-Depends-Indep: ghc-doc,
  libghc-ansi-terminal-doc,
  libghc-ansi-wl-pprint-doc,


=====================================
p/haskell-trifecta/debian/rules
=====================================
--- a/p/haskell-trifecta/debian/rules
+++ b/p/haskell-trifecta/debian/rules
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_ENABLE_TESTS = yes
+ifeq (armel,$(DEB_HOST_ARCH))
+	# doctests fail on armel due to #839840
+	DEB_ENABLE_TESTS = no
+else
+	DEB_ENABLE_TESTS = yes
+endif
 
 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/1acb66ab9bc7b021b178cfb14d23cc12495d6a6e

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/1acb66ab9bc7b021b178cfb14d23cc12495d6a6e
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/20180612/aece24e1/attachment-0001.html>