5 files changed, 26 insertions, 25 deletions
diff --git a/p/haskell-http-api-data/debian/changelog b/p/haskell-http-api-data/debian/changelog
index d52df9a46..837304da5 100644
--- a/p/haskell-http-api-data/debian/changelog
+++ b/p/haskell-http-api-data/debian/changelog
@@ -1,13 +1,25 @@
-haskell-http-api-data (0.2.2-2) UNRELEASED; urgency=medium
+haskell-http-api-data (0.2.4-2) unstable; urgency=medium
+
+  * Disable testsuite on armel, where ghci is broken.
+
+ -- Clint Adams <clint@debian.org>  Thu, 06 Oct 2016 13:09:20 -0400
+
+haskell-http-api-data (0.2.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 04 Aug 2016 13:26:40 -0400
+
+haskell-http-api-data (0.2.3-1) unstable; urgency=medium
 
   [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
 
-  [ Gianfranco Costamagna ]
-  * Fix VCS fields
+  [ Clint Adams ]
+  * New upstream release
 
- -- Dmitry Bogatov <KAction@gnu.org>  Tue, 10 May 2016 09:35:32 +0300
+ -- Clint Adams <clint@debian.org>  Tue, 12 Jul 2016 16:53:30 -0400
 
 haskell-http-api-data (0.2.2-1) unstable; urgency=medium
 
diff --git a/p/haskell-http-api-data/debian/control b/p/haskell-http-api-data/debian/control
index e3f2443fc..9f8011837 100644
--- a/p/haskell-http-api-data/debian/control
+++ b/p/haskell-http-api-data/debian/control
@@ -14,11 +14,12 @@ Build-Depends: debhelper (>= 9),
  libghc-text-show-prof,
  libghc-time-locale-compat-dev,
  libghc-time-locale-compat-prof,
- libghc-doctest-dev,
- libghc-glob-dev,
- libghc-hspec-dev (>= 1.3),
  libghc-hunit-dev,
  libghc-quickcheck2-dev,
+ libghc-doctest-dev (>= 0.11),
+ libghc-doctest-dev (<< 0.12),
+ libghc-hspec-dev (>= 1.3),
+ libghc-text-dev,
 Build-Depends-Indep: ghc-doc,
  libghc-text-doc,
  libghc-text-show-doc,
diff --git a/p/haskell-http-api-data/debian/patches/disable-doctest b/p/haskell-http-api-data/debian/patches/disable-doctest
deleted file mode 100644
index 663663645..000000000
--- a/p/haskell-http-api-data/debian/patches/disable-doctest
+++ /dev/null
@@ -1,17 +0,0 @@
-doctest is choking on CPP directives, so disable for now
-
---- a/http-api-data.cabal
-+++ b/http-api-data.cabal
-@@ -46,12 +46,6 @@
-                    , text
-                    , time
- 
--test-suite doctest
--    build-depends:    base, doctest, Glob
--    hs-source-dirs:   test
--    main-is:          DocTest.hs
--    type:             exitcode-stdio-1.0
--
- source-repository head
-   type:     git
-   location: https://github.com/fizruk/http-api-data
diff --git a/p/haskell-http-api-data/debian/patches/series b/p/haskell-http-api-data/debian/patches/series
deleted file mode 100644
index 292e6dcf0..000000000
--- a/p/haskell-http-api-data/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-doctest
diff --git a/p/haskell-http-api-data/debian/rules b/p/haskell-http-api-data/debian/rules
index 7095c7493..82fbf1b26 100755
--- a/p/haskell-http-api-data/debian/rules
+++ b/p/haskell-http-api-data/debian/rules
@@ -2,7 +2,13 @@
 
 DEB_CABAL_PACKAGE = http-api-data
 DEB_DEFAULT_COMPILER = ghc
+
+# 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