[Git][haskell-team/DHG_packages][master] http-api-data: Patch for newer doctests

[Ilias Tsitsimpis]

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


Commits:
ee0ca32b by Ilias Tsitsimpis at 2018-10-23T11:12:11Z
http-api-data: Patch for newer doctests

- - - - -


6 changed files:

- p/haskell-http-api-data/debian/changelog
- p/haskell-http-api-data/debian/control
- − p/haskell-http-api-data/debian/patches/disable-doctests
- + p/haskell-http-api-data/debian/patches/newer-deps
- p/haskell-http-api-data/debian/patches/series
- p/haskell-http-api-data/debian/rules


Changes:

=====================================
p/haskell-http-api-data/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-http-api-data (0.3.8.1-4) unstable; urgency=medium
+
+  * Apply upstream patch for newer doctest
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 23 Oct 2018 13:42:41 +0300
+
 haskell-http-api-data (0.3.8.1-3) unstable; urgency=medium
 
   * Drop build-dependency on doctest as we are patching the doctests


=====================================
p/haskell-http-api-data/debian/control
=====================================
@@ -23,8 +23,6 @@ Build-Depends:
  libghc-http-types-dev (>= 0.8.6),
  libghc-http-types-dev (<< 0.13),
  libghc-http-types-prof,
- libghc-text-show-dev (>= 2),
- libghc-text-show-prof,
  libghc-time-locale-compat-dev (>= 0.1.1.0),
  libghc-time-locale-compat-dev (<< 0.2),
  libghc-time-locale-compat-prof,
@@ -39,6 +37,10 @@ Build-Depends:
  libghc-uuid-types-prof,
  libghc-hunit-dev <!nocheck>,
  libghc-quickcheck2-dev (>= 2.9) <!nocheck>,
+ libghc-doctest-dev (>= 0.11) <!nocheck>,
+ libghc-doctest-dev (<< 0.17) <!nocheck>,
+ libghc-cabal-doctest-dev (>= 1.0.6) <!nocheck>,
+ libghc-cabal-doctest-dev (<< 1.1) <!nocheck>,
  libghc-hspec-dev (>= 2.4.7) <!nocheck>,
  libghc-quickcheck-instances-dev (>= 0.3.12) <!nocheck>,
  libghc-unordered-containers-dev,
@@ -48,7 +50,6 @@ Build-Depends-Indep: ghc-doc,
  libghc-attoparsec-iso8601-doc,
  libghc-hashable-doc,
  libghc-http-types-doc,
- libghc-text-show-doc,
  libghc-time-locale-compat-doc,
  libghc-unordered-containers-doc,
  libghc-uri-bytestring-doc,


=====================================
p/haskell-http-api-data/debian/patches/disable-doctests deleted
=====================================
@@ -1,21 +0,0 @@
---- a/http-api-data.cabal
-+++ b/http-api-data.cabal
-@@ -87,18 +87,6 @@
-                    , bytestring
-                    , uuid
- 
--test-suite doctests
--  ghc-options:      -Wall
--  build-depends:
--    base,
--    directory >= 1.0,
--    doctest >= 0.11 && <0.14,
--    filepath
--  default-language: Haskell2010
--  hs-source-dirs:   test
--  main-is:          doctests.hs
--  type:             exitcode-stdio-1.0
--
- source-repository head
-   type:     git
-   location: https://github.com/fizruk/http-api-data


=====================================
p/haskell-http-api-data/debian/patches/newer-deps
=====================================
@@ -0,0 +1,29 @@
+Index: b/http-api-data.cabal
+===================================================================
+--- a/http-api-data.cabal
++++ b/http-api-data.cabal
+@@ -24,12 +24,12 @@ tested-with:
+   GHC==7.10.3,
+   GHC==8.0.2,
+   GHC==8.2.2,
+-  GHC==8.4.1
++  GHC==8.4.3
+ 
+ custom-setup
+   setup-depends:
+-    base >= 4.7 && <4.12,
+-    Cabal >= 1.18 && <2.3,
++    base,
++    Cabal,
+     cabal-doctest >=1.0.6 && <1.1
+ 
+ flag use-text-show
+@@ -95,7 +95,7 @@ test-suite doctests
+   build-depends:
+     base,
+     directory >= 1.0,
+-    doctest >= 0.11 && <0.16,
++    doctest >= 0.11 && <0.17,
+     filepath
+   default-language: Haskell2010
+   hs-source-dirs:   test


=====================================
p/haskell-http-api-data/debian/patches/series
=====================================
@@ -0,0 +1 @@
+newer-deps


=====================================
p/haskell-http-api-data/debian/rules
=====================================
@@ -4,12 +4,9 @@ DEB_CABAL_PACKAGE = http-api-data
 DEB_DEFAULT_COMPILER = ghc
 
 DEB_ENABLE_TESTS = yes
-# ghci is broken on armel (#839840)
-# ifeq (,$(filter $(DEB_BUILD_ARCH),armel))
-# DEB_ENABLE_TESTS = yes
-# else
-# DEB_ENABLE_TESTS = no
-# endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
+
+# Run tests under C.UTF-8.
+check-ghc-stamp: export LC_ALL := C.UTF-8



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/ee0ca32beb2c377294fc2b00b3c3f44dd6d46b12

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/ee0ca32beb2c377294fc2b00b3c3f44dd6d46b12
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/20181023/92a14d9d/attachment-0001.html>