log-domain: Upgrading from 0.10.3.1 to 0.11.1

5 files changed, 17 insertions, 50 deletions

diff --git a/p/haskell-log-domain/debian/changelog b/p/haskell-log-domain/debian/changelog
index e73e51b89..db29f2360 100644
--- a/p/haskell-log-domain/debian/changelog
+++ b/p/haskell-log-domain/debian/changelog
@@ -1,3 +1,9 @@
+haskell-log-domain (0.11.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 06 Jul 2017 17:21:40 -0400
+
 haskell-log-domain (0.10.3.1-6) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-log-domain/debian/control b/p/haskell-log-domain/debian/control
index 18b88fc2d..93326ff7d 100644
--- a/p/haskell-log-domain/debian/control
+++ b/p/haskell-log-domain/debian/control
@@ -10,37 +10,34 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- libghc-bytes-dev (<< 1),
  libghc-bytes-dev (>= 0.7),
+ libghc-bytes-dev (<< 1),
  libghc-bytes-prof,
- libghc-cereal-dev (<< 0.6),
  libghc-cereal-dev (>= 0.3.5),
+ libghc-cereal-dev (<< 0.6),
  libghc-cereal-prof,
- libghc-comonad-dev (<< 6),
  libghc-comonad-dev (>= 4),
+ libghc-comonad-dev (<< 6),
  libghc-comonad-prof,
- libghc-distributive-dev (<< 1),
  libghc-distributive-dev (>= 0.3),
+ libghc-distributive-dev (<< 1),
  libghc-distributive-prof,
  libghc-generic-deriving-dev,
  libghc-generic-deriving-prof,
+ libghc-hashable-dev (>= 1.2.5),
  libghc-hashable-dev (<< 1.3),
- libghc-hashable-dev (>= 1.1.2.3),
- libghc-hashable-extras-dev (<< 1),
- libghc-hashable-extras-dev (>= 0.2),
- libghc-hashable-extras-prof,
  libghc-hashable-prof,
- libghc-safecopy-dev (<< 0.10),
  libghc-safecopy-dev (>= 0.8.1),
+ libghc-safecopy-dev (<< 0.10),
  libghc-safecopy-prof,
- libghc-semigroupoids-dev (<< 6),
  libghc-semigroupoids-dev (>= 4),
+ libghc-semigroupoids-dev (<< 6),
  libghc-semigroupoids-prof,
- libghc-semigroups-dev (<< 1),
  libghc-semigroups-dev (>= 0.8.4),
+ libghc-semigroups-dev (<< 1),
  libghc-semigroups-prof,
- libghc-vector-dev (<< 0.12),
  libghc-vector-dev (>= 0.9),
+ libghc-vector-dev (<< 0.13),
  libghc-vector-prof,
 Build-Depends-Indep:
  ghc-doc,
@@ -50,16 +47,15 @@ Build-Depends-Indep:
  libghc-distributive-doc,
  libghc-generic-deriving-doc,
  libghc-hashable-doc,
- libghc-hashable-extras-doc,
  libghc-safecopy-doc,
  libghc-semigroupoids-doc,
  libghc-semigroups-doc,
  libghc-vector-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://hackage.haskell.org/package/log-domain
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-log-domain
-X-Description: Log-domain arithmetic
+X-Description: log-domain arithmetic
  This package provides log-domain floats, doubles and complex numbers.
 
 Package: libghc-log-domain-dev
diff --git a/p/haskell-log-domain/debian/patches/fix-doctests.diff b/p/haskell-log-domain/debian/patches/fix-doctests.diff
deleted file mode 100644
index 214b698db..000000000
--- a/p/haskell-log-domain/debian/patches/fix-doctests.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: log-domain-0.10.2/tests/doctests.hsc
-===================================================================
---- log-domain-0.10.2.orig/tests/doctests.hsc
-+++ log-domain-0.10.2/tests/doctests.hsc
-@@ -54,9 +54,9 @@ withUnicode m = m
- main :: IO ()
- main = withUnicode $ getSources >>= \sources -> doctest $
-     "-isrc"
--  : "-idist/build/autogen"
-+  : "-idist-ghc/build/autogen"
-   : "-optP-include"
--  : "-optPdist/build/autogen/cabal_macros.h"
-+  : "-optPdist-ghc/build/autogen/cabal_macros.h"
-   : "-hide-all-packages"
-   : "-Iincludes"
-   : map ("-package="++) deps ++ sources
diff --git a/p/haskell-log-domain/debian/patches/new-metadata-from-hackage b/p/haskell-log-domain/debian/patches/new-metadata-from-hackage
deleted file mode 100644
index 998f20e05..000000000
--- a/p/haskell-log-domain/debian/patches/new-metadata-from-hackage
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: haskell-log-domain/log-domain.cabal
-===================================================================
---- haskell-log-domain.orig/log-domain.cabal	2015-11-30 23:26:52.000000000 +0100
-+++ haskell-log-domain/log-domain.cabal	2016-06-01 10:06:54.953842054 +0200
-@@ -43,10 +43,10 @@
- library
-   build-depends:
-     base                      >= 4.3      && < 5,
--    binary                    >= 0.5      && < 0.8,
-+    binary                    >= 0.5      && < 0.9,
-     bytes                     >= 0.7      && < 1,
-     cereal                    >= 0.3.5    && < 0.6,
--    comonad                   >= 4        && < 5,
-+    comonad                   >= 4        && < 6,
-     deepseq                   >= 1.3      && < 1.5,
-     distributive              >= 0.3      && < 1,
-     hashable                  >= 1.1.2.3  && < 1.3,
diff --git a/p/haskell-log-domain/debian/patches/series b/p/haskell-log-domain/debian/patches/series
deleted file mode 100644
index d09d7f2fe..000000000
--- a/p/haskell-log-domain/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-new-metadata-from-hackage
-fix-doctests.diff