[DHG_packages] 01/01: text-show: Upgrading from 2.1.1 to 2.1.2

Clint Adams clint at moszumanska.debian.org
Sun Mar 13 19:58:40 UTC 2016


This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 80ac51e3a3e8e6e98009f68780dd9989510a9540
Author: Clint Adams <clint at debian.org>
Date:   Sun Mar 13 15:43:44 2016 -0400

    text-show: Upgrading from 2.1.1 to 2.1.2
---
 p/haskell-text-show/debian/changelog               |  6 ++++++
 p/haskell-text-show/debian/control                 | 11 +++++++---
 .../debian/patches/errorcallwithlocation           | 24 ----------------------
 .../debian/patches/no-bytestring-builder           | 10 ++++-----
 p/haskell-text-show/debian/patches/no-nats         | 14 ++++++-------
 p/haskell-text-show/debian/patches/series          |  1 -
 6 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/p/haskell-text-show/debian/changelog b/p/haskell-text-show/debian/changelog
index 1eacbbd..64e6b2c 100644
--- a/p/haskell-text-show/debian/changelog
+++ b/p/haskell-text-show/debian/changelog
@@ -1,3 +1,9 @@
+haskell-text-show (2.1.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Sun, 13 Mar 2016 15:43:44 -0400
+
 haskell-text-show (2.1.1-1) unstable; urgency=low
 
   * Initial release
diff --git a/p/haskell-text-show/debian/control b/p/haskell-text-show/debian/control
index 7dc03b5..a8014bc 100644
--- a/p/haskell-text-show/debian/control
+++ b/p/haskell-text-show/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
  libghc-base-compat-dev (>= 0.8.1),
  libghc-base-compat-dev (<< 1),
  libghc-base-compat-prof,
- libghc-generic-deriving-dev (>= 1.8),
+ libghc-generic-deriving-dev (>= 1.9),
  libghc-generic-deriving-dev (<< 2),
  libghc-generic-deriving-prof,
  libghc-semigroups-dev (>= 0.16.1),
@@ -34,8 +34,13 @@ Build-Depends: debhelper (>= 9),
  libghc-quickcheck-instances-dev (<< 0.4),
  libghc-base-orphans-dev (>= 0.4.2),
  libghc-base-orphans-dev (<< 1),
- libghc-bifunctors-dev (>= 5),
+ libghc-bifunctors-dev (>= 5.1),
  libghc-bifunctors-dev (<< 6),
+ libghc-hspec-dev (>= 2),
+ libghc-hspec-dev (<< 3),
+ libghc-quickcheck-instances-dev (>= 0.1),
+ libghc-quickcheck-instances-dev (<< 0.4),
+ libghc-tagged-dev (>= 0.8.1),
  libghc-transformers-compat-dev (>= 0.3),
  libghc-transformers-compat-dev (<< 1),
 Build-Depends-Indep: ghc-doc,
@@ -45,7 +50,7 @@ Build-Depends-Indep: ghc-doc,
  libghc-tagged-doc,
  libghc-text-doc,
  libghc-void-doc,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: https://github.com/RyanGlScott/text-show
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
 Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
diff --git a/p/haskell-text-show/debian/patches/errorcallwithlocation b/p/haskell-text-show/debian/patches/errorcallwithlocation
deleted file mode 100644
index c8a9ff6..0000000
--- a/p/haskell-text-show/debian/patches/errorcallwithlocation
+++ /dev/null
@@ -1,24 +0,0 @@
-This seems to have been added after base 4.8.2.0?
-
---- a/src/TextShow/Control/Exception.hs
-+++ b/src/TextShow/Control/Exception.hs
-@@ -210,7 +210,7 @@
- --
- -- /Since: 2/
- showbErrorCall :: ErrorCall -> Builder
--#if MIN_VERSION_base(4,8,2)
-+#if MIN_VERSION_base(4,9,0)
- showbErrorCall (ErrorCallWithLocation err "")  = fromString err
- showbErrorCall (ErrorCallWithLocation err loc) =
-   fromString err <> singleton '\n' <> fromString loc
---- a/tests/Instances/Control/Exception.hs
-+++ b/tests/Instances/Control/Exception.hs
-@@ -98,7 +98,7 @@
-     arbitrary = RecUpdError <$> arbitrary
- 
- instance Arbitrary ErrorCall where
--#if MIN_VERSION_base(4,8,2)
-+#if MIN_VERSION_base(4,9,0)
-     arbitrary = ErrorCallWithLocation <$> arbitrary <*> arbitrary
- #else
-     arbitrary = ErrorCall <$> arbitrary
diff --git a/p/haskell-text-show/debian/patches/no-bytestring-builder b/p/haskell-text-show/debian/patches/no-bytestring-builder
index bde5c7e..2124db8 100644
--- a/p/haskell-text-show/debian/patches/no-bytestring-builder
+++ b/p/haskell-text-show/debian/patches/no-bytestring-builder
@@ -1,18 +1,18 @@
 --- a/text-show.cabal
 +++ b/text-show.cabal
-@@ -136,7 +136,6 @@
+@@ -140,7 +140,6 @@
                       , base               >= 4.8     && < 5
                       , base-compat        >= 0.8.1   && < 1
                       , bytestring         >= 0.9     && < 0.11
 -                     , bytestring-builder
                       , containers         >= 0.1     && < 0.6
-                      , generic-deriving   >= 1.8     && < 2
+                      , generic-deriving   >= 1.9     && < 2
                       , ghc-prim
-@@ -304,7 +303,6 @@
+@@ -308,7 +307,6 @@
                       , base-orphans         >= 0.4.2  && < 1
-                      , bifunctors           >= 5      && < 6
+                      , bifunctors           >= 5.1    && < 6
                       , bytestring           >= 0.9    && < 0.11
 -                     , bytestring-builder
-                      , generic-deriving     >= 1.8.0  && < 2
+                      , generic-deriving     >= 1.9    && < 2
                       , ghc-prim
                       , hspec                >= 2      && < 3
diff --git a/p/haskell-text-show/debian/patches/no-nats b/p/haskell-text-show/debian/patches/no-nats
index 99de886..c3be7ac 100644
--- a/p/haskell-text-show/debian/patches/no-nats
+++ b/p/haskell-text-show/debian/patches/no-nats
@@ -1,6 +1,6 @@
 --- a/text-show.cabal
 +++ b/text-show.cabal
-@@ -133,7 +133,7 @@
+@@ -137,7 +137,7 @@
                         TextShow.TH.Names
                         TextShow.Utils
    build-depends:       array              >= 0.3     && < 0.6
@@ -9,15 +9,15 @@
                       , base-compat        >= 0.8.1   && < 1
                       , bytestring         >= 0.9     && < 0.11
                       , bytestring-builder
-@@ -141,7 +141,6 @@
-                      , generic-deriving   >= 1.8     && < 2
+@@ -145,7 +145,6 @@
+                      , generic-deriving   >= 1.9     && < 2
                       , ghc-prim
                       , integer-gmp
 -                     , nats               >= 0.1     && < 2
                       , semigroups         >= 0.16.1  && < 1
                       , tagged             >= 0.4.4   && < 1
                       , text               >= 0.11.1  && < 1.3
-@@ -300,7 +299,7 @@
+@@ -304,7 +303,7 @@
  
                         TransformersCompat
    build-depends:       array                >= 0.3    && < 0.6
@@ -25,9 +25,9 @@
 +                     , base                 >= 4.8    && < 5
                       , base-compat          >= 0.8.2  && < 1
                       , base-orphans         >= 0.4.2  && < 1
-                      , bifunctors           >= 5      && < 6
-@@ -309,7 +308,6 @@
-                      , generic-deriving     >= 1.8.0  && < 2
+                      , bifunctors           >= 5.1    && < 6
+@@ -313,7 +312,6 @@
+                      , generic-deriving     >= 1.9    && < 2
                       , ghc-prim
                       , hspec                >= 2      && < 3
 -                     , nats                 >= 0.1    && < 2
diff --git a/p/haskell-text-show/debian/patches/series b/p/haskell-text-show/debian/patches/series
index ee334ee..32559cf 100644
--- a/p/haskell-text-show/debian/patches/series
+++ b/p/haskell-text-show/debian/patches/series
@@ -1,3 +1,2 @@
 no-nats
 no-bytestring-builder
-errorcallwithlocation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git



More information about the Pkg-haskell-commits mailing list