[Git][haskell-team/DHG_packages][master] haddock-library: Upgrading from 1.5.0.1 to 1.7.0

Clint Adams gitlab at salsa.debian.org
Sun Jul 28 01:28:06 BST 2019



Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
5204785b by Clint Adams at 2019-07-28T00:26:13Z
haddock-library: Upgrading from 1.5.0.1 to 1.7.0

- - - - -


8 changed files:

- p/haskell-haddock-library/debian/changelog
- p/haskell-haddock-library/debian/control
- − p/haskell-haddock-library/debian/patches/avoid-unicode-in-description
- p/haskell-haddock-library/debian/patches/disable-fixtures-test-suite
- − p/haskell-haddock-library/debian/patches/newer-base-compat
- p/haskell-haddock-library/debian/patches/newer-hspec
- p/haskell-haddock-library/debian/patches/series
- − p/haskell-haddock-library/debian/patches/system-attoparsec


Changes:

=====================================
p/haskell-haddock-library/debian/changelog
=====================================
@@ -1,9 +1,13 @@
-haskell-haddock-library (1.5.0.1-3) UNRELEASED; urgency=medium
+haskell-haddock-library (1.7.0-1) unstable; urgency=medium
 
+  [ Dmitry Bogatov ]
   * Fix "Upstream-Name" field in "debian/copyright" to match package
     name on hackage.
 
- -- Dmitry Bogatov <KAction at debian.org>  Thu, 16 May 2019 14:51:23 +0000
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 27 Jul 2019 20:22:22 -0400
 
 haskell-haddock-library (1.5.0.1-2) unstable; urgency=medium
 


=====================================
p/haskell-haddock-library/debian/control
=====================================
@@ -9,18 +9,17 @@ Build-Depends: debhelper (>= 10),
  cdbs,
  ghc (>= 8),
  ghc-prof,
- libghc-attoparsec-dev,
- libghc-attoparsec-prof,
  libghc-quickcheck2-dev (>= 2.11),
  libghc-quickcheck2-dev (<< 2.12),
  libghc-quickcheck2-prof,
  libghc-base-compat-dev (>= 0.9.3),
+ libghc-base-compat-dev (<< 0.11),
+ libghc-base-compat-prof,
  libghc-hspec-dev (>= 2.4.4),
  libghc-hspec-dev (<< 2.6),
  libghc-hspec-prof,
 Build-Depends-Indep: ghc-doc,
- libghc-attoparsec-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.4.0
 Homepage: http://www.haskell.org/haddock/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-haddock-library
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-haddock-library]


=====================================
p/haskell-haddock-library/debian/patches/avoid-unicode-in-description deleted
=====================================
@@ -1,13 +0,0 @@
-Index: b/haddock-library.cabal
-===================================================================
---- a/haddock-library.cabal
-+++ b/haddock-library.cabal
-@@ -7,7 +7,7 @@ description:          Haddock is a docum
-                       without pulling in the GHC dependency. Please note that the
-                       API is likely to change so specify upper bounds in your
-                       project if you can't release often. For interacting with Haddock
--                      itself, see the ‘haddock’ package.
-+                      itself, see the 'haddock' package.
- license:              BSD3
- license-files:        LICENSE
-                       vendor/attoparsec-0.13.1.0/LICENSE


=====================================
p/haskell-haddock-library/debian/patches/disable-fixtures-test-suite
=====================================
@@ -2,12 +2,10 @@ Description: Disable fixtures test-suite
  It requires tree-diff which is not packaged yet.
 Author: Ilias Tsitsimpis <iliastsi at debian.org>
 
-Index: b/haddock-library.cabal
-===================================================================
 --- a/haddock-library.cabal
 +++ b/haddock-library.cabal
-@@ -92,6 +92,7 @@ test-suite spec
-     hspec-discover:hspec-discover ^>= 2.4.4
+@@ -86,6 +86,7 @@
+     hspec-discover:hspec-discover >= 2.4.4 && < 2.7
  
  test-suite fixtures
 +  buildable: False


=====================================
p/haskell-haddock-library/debian/patches/newer-base-compat deleted
=====================================
@@ -1,22 +0,0 @@
-Index: b/haddock-library.cabal
-===================================================================
---- a/haddock-library.cabal
-+++ b/haddock-library.cabal
-@@ -73,7 +73,7 @@ test-suite spec
-       Documentation.Haddock.Utf8Spec
- 
-   build-depends:
--      base-compat   ^>= 0.9.3
-+      base-compat   >= 0.9.3
-     , containers   >= 0.4.2.1 && < 0.6
-     , transformers   >= 0.3.0   && < 0.6
-     , hspec         >= 2.4.4 && < 2.6
-@@ -99,7 +99,7 @@ test-suite fixtures
-   ghc-options:      -Wall
-   hs-source-dirs:   fixtures
-   build-depends:
--      base-compat           ^>= 0.9.3
-+      base-compat           >= 0.9.3
-     , directory             ^>= 1.3.0.2
-     , filepath              ^>= 1.4.1.2
-     , optparse-applicative  ^>= 0.14.0.0


=====================================
p/haskell-haddock-library/debian/patches/newer-hspec
=====================================
@@ -1,13 +1,19 @@
-Index: b/haddock-library.cabal
-===================================================================
 --- a/haddock-library.cabal
 +++ b/haddock-library.cabal
-@@ -76,7 +76,7 @@ test-suite spec
-       base-compat   ^>= 0.9.3
-     , containers   >= 0.4.2.1 && < 0.6
+@@ -76,14 +76,14 @@
+     , bytestring   >= 0.9.2.1 && < 0.11
+     , containers   >= 0.4.2.1 && < 0.7
      , transformers   >= 0.3.0   && < 0.6
--    , hspec         ^>= 2.4.4
-+    , hspec         >= 2.4.4 && < 2.6
+-    , hspec        >= 2.4.4   && < 2.6
++    , hspec        >= 2.4.4   && < 2.7
      , QuickCheck    ^>= 2.11
+     , text         >= 1.2.3.0  && < 1.3
+     , parsec       >= 3.1.13.0 && < 3.2
+     , deepseq      >= 1.3     && < 1.5
  
-   build-depends: attoparsec
+   build-tool-depends:
+-    hspec-discover:hspec-discover >= 2.4.4 && < 2.6
++    hspec-discover:hspec-discover >= 2.4.4 && < 2.7
+ 
+ test-suite fixtures
+   type:             exitcode-stdio-1.0


=====================================
p/haskell-haddock-library/debian/patches/series
=====================================
@@ -1,5 +1,2 @@
-avoid-unicode-in-description
-system-attoparsec
 newer-hspec
 disable-fixtures-test-suite
-newer-base-compat


=====================================
p/haskell-haddock-library/debian/patches/system-attoparsec deleted
=====================================
@@ -1,62 +0,0 @@
-Index: b/haddock-library.cabal
-===================================================================
---- a/haddock-library.cabal
-+++ b/haddock-library.cabal
-@@ -28,7 +28,6 @@ library
-     , containers   >= 0.4.2.1 && < 0.6
-     , transformers >= 0.3.0   && < 0.6
- 
--  -- internal sub-lib
-   build-depends:        attoparsec
- 
-   hs-source-dirs:       src
-@@ -49,41 +48,6 @@ library
-   if impl(ghc >= 8.0)
-     ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
- 
--library attoparsec
--  default-language:     Haskell2010
--
--  build-depends:
--      base         >= 4.5     && < 4.12
--    , bytestring   >= 0.9.2.1 && < 0.11
--    , deepseq      >= 1.3     && < 1.5
--
--  hs-source-dirs:       vendor/attoparsec-0.13.1.0
--
--  -- NB: haddock-library needs only small part of lib:attoparsec
--  --     internally, so we only bundle that subset here
--  exposed-modules:
--    Data.Attoparsec.ByteString
--    Data.Attoparsec.ByteString.Char8
--    Data.Attoparsec.Combinator
--
--  other-modules:
--    Data.Attoparsec
--    Data.Attoparsec.ByteString.Buffer
--    Data.Attoparsec.ByteString.FastSet
--    Data.Attoparsec.ByteString.Internal
--    Data.Attoparsec.Internal
--    Data.Attoparsec.Internal.Fhthagn
--    Data.Attoparsec.Internal.Types
--    Data.Attoparsec.Number
--
--  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2
--
--  ghc-options: -Wall
--  if impl(ghc >= 8.0)
--    ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
--  else
--    build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0
--
- 
- test-suite spec
-   type:             exitcode-stdio-1.0
-@@ -115,7 +79,6 @@ test-suite spec
-     , hspec         ^>= 2.4.4
-     , QuickCheck    ^>= 2.11
- 
--  -- internal sub-lib
-   build-depends: attoparsec
- 
-   -- Versions for the dependencies below are transitively pinned by



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/5204785b0d978e722203d8b6ba68734e1ef108a5
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/20190728/bf35977b/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list