[Git][haskell-team/DHG_packages][master] 4 commits: stack: Upgrading from 1.7.1 to 1.9.3.1

Ilias Tsitsimpis gitlab at salsa.debian.org
Sun Mar 1 18:45:38 GMT 2020 


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


Commits:
7bb8b133 by Ilias Tsitsimpis at 2020-03-01T20:32:02+02:00
stack: Upgrading from 1.7.1 to 1.9.3.1

- - - - -
95b13b4f by Ilias Tsitsimpis at 2020-03-01T20:33:17+02:00
stack: Refresh patches

- - - - -
b51710c6 by Ilias Tsitsimpis at 2020-03-01T20:34:38+02:00
stack: Pass disable-git-info flag

- - - - -
77330795 by Ilias Tsitsimpis at 2020-03-01T20:39:46+02:00
stack: Bump std-version to 4.5.0

- - - - -


6 changed files:

- p/haskell-stack/debian/changelog
- p/haskell-stack/debian/control
- − p/haskell-stack/debian/patches/newer-smallcheck
- p/haskell-stack/debian/patches/remove-mintty.patch
- p/haskell-stack/debian/patches/series
- p/haskell-stack/debian/rules


Changes:

=====================================
p/haskell-stack/debian/changelog
=====================================
@@ -1,9 +1,12 @@
-haskell-stack (1.7.1-4) UNRELEASED; urgency=medium
+haskell-stack (1.9.3.1-1) unstable; urgency=medium
 
+  * New upstream release (Closes: #939847)
   * Remove Dmitry Bogatov from Uploaders per his request. Thank you
     Dmitry for your previous maintainership.
+  * Refresh patches, drop newer-smallcheck (applied upstream)
+  * Bump std-version to 4.5.0, no changes required
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 30 Jul 2019 13:10:40 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 01 Mar 2020 17:46:51 +0200
 
 haskell-stack (1.7.1-3) unstable; urgency=medium
 


=====================================
p/haskell-stack/debian/control
=====================================
@@ -11,207 +11,76 @@ Build-Depends:
  debhelper (>= 10),
  haskell-devscripts (>= 0.13),
  ghc (>= 8.4.3),
- ghc-prof,
  libghc-aeson-dev,
- libghc-aeson-prof,
  libghc-annotated-wl-pprint-dev (>= 0.7.0),
  libghc-annotated-wl-pprint-dev (<< 0.8),
- libghc-annotated-wl-pprint-prof,
  libghc-ansi-terminal-dev,
- libghc-ansi-terminal-prof,
  libghc-async-dev,
- libghc-async-prof,
  libghc-attoparsec-dev,
- libghc-attoparsec-prof,
  libghc-base64-bytestring-dev,
- libghc-base64-bytestring-prof,
  libghc-bindings-uname-dev,
- libghc-bindings-uname-prof,
  libghc-conduit-dev,
- libghc-conduit-prof,
- libghc-conduit-extra-dev (>= 1.2.3.1),
- libghc-conduit-extra-prof,
+ libghc-conduit-extra-dev,
  libghc-cryptonite-dev,
- libghc-cryptonite-prof,
  libghc-cryptonite-conduit-dev,
- libghc-cryptonite-conduit-prof,
  libghc-echo-dev,
- libghc-echo-prof,
  libghc-exceptions-dev,
- libghc-exceptions-prof,
  libghc-extra-dev,
- libghc-extra-prof,
  libghc-file-embed-dev,
- libghc-file-embed-prof,
  libghc-filelock-dev,
- libghc-filelock-prof,
  libghc-fsnotify-dev,
- libghc-fsnotify-prof,
  libghc-generic-deriving-dev,
- libghc-generic-deriving-prof,
  libghc-hackage-security-dev (>= 0.5.2.2),
  libghc-hackage-security-dev (<< 0.6),
- libghc-hackage-security-prof,
  libghc-hashable-dev,
- libghc-hashable-prof,
  libghc-hpack-dev,
- libghc-hpack-prof,
  libghc-http-client-dev,
- libghc-http-client-prof,
  libghc-http-client-tls-dev,
- libghc-http-client-tls-prof,
  libghc-http-conduit-dev,
- libghc-http-conduit-prof,
  libghc-http-types-dev,
- libghc-http-types-prof,
  libghc-memory-dev,
- libghc-memory-prof,
  libghc-microlens-dev,
- libghc-microlens-prof,
  libghc-monad-logger-dev,
- libghc-monad-logger-prof,
  libghc-mono-traversable-dev,
- libghc-mono-traversable-prof,
  libghc-mustache-dev,
- libghc-mustache-prof,
  libghc-neat-interpolation-dev,
- libghc-neat-interpolation-prof,
  libghc-network-uri-dev,
- libghc-network-uri-prof,
  libghc-open-browser-dev,
- libghc-open-browser-prof,
  libghc-optparse-applicative-dev,
- libghc-optparse-applicative-prof,
  libghc-path-dev,
- libghc-path-prof,
  libghc-path-io-dev,
- libghc-path-io-prof,
  libghc-persistent-dev,
- libghc-persistent-prof,
  libghc-persistent-sqlite-dev,
- libghc-persistent-sqlite-prof,
  libghc-persistent-template-dev,
- libghc-persistent-template-prof,
  libghc-primitive-dev,
- libghc-primitive-prof,
  libghc-project-template-dev,
- libghc-project-template-prof,
  libghc-regex-applicative-text-dev,
- libghc-regex-applicative-text-prof,
  libghc-resourcet-dev,
- libghc-resourcet-prof,
  libghc-retry-dev,
- libghc-retry-prof,
  libghc-rio-dev,
- libghc-rio-prof,
  libghc-semigroups-dev,
- libghc-semigroups-prof,
  libghc-split-dev,
- libghc-split-prof,
  libghc-store-dev,
- libghc-store-prof,
  libghc-store-core-dev,
- libghc-store-core-prof,
  libghc-streaming-commons-dev,
- libghc-streaming-commons-prof,
  libghc-tar-dev,
- libghc-tar-prof,
  libghc-temporary-dev,
- libghc-temporary-prof,
  libghc-text-metrics-dev,
- libghc-text-metrics-prof,
  libghc-th-reify-many-dev,
- libghc-th-reify-many-prof,
  libghc-tls-dev,
- libghc-tls-prof,
- libghc-typed-process-dev (>= 0.2.1.0),
- libghc-typed-process-prof,
+ libghc-typed-process-dev,
  libghc-unicode-transforms-dev,
- libghc-unicode-transforms-prof,
  libghc-unix-compat-dev,
- libghc-unix-compat-prof,
- libghc-unliftio-dev (>= 0.2.4.0),
- libghc-unliftio-prof,
+ libghc-unliftio-dev,
  libghc-unordered-containers-dev,
- libghc-unordered-containers-prof,
  libghc-vector-dev,
- libghc-vector-prof,
  libghc-yaml-dev,
- libghc-yaml-prof,
  libghc-zip-archive-dev,
- libghc-zip-archive-prof,
  libghc-zlib-dev,
- libghc-zlib-prof,
- libghc-gitrev-dev,
- libghc-optparse-simple-dev,
  libghc-quickcheck2-dev,
  libghc-hspec-dev,
  libghc-smallcheck-dev,
-Build-Depends-Indep: ghc-doc,
- libghc-aeson-doc,
- libghc-annotated-wl-pprint-doc,
- libghc-ansi-terminal-doc,
- libghc-async-doc,
- libghc-attoparsec-doc,
- libghc-base64-bytestring-doc,
- libghc-bindings-uname-doc,
- libghc-conduit-doc,
- libghc-conduit-extra-doc,
- libghc-cryptonite-doc,
- libghc-cryptonite-conduit-doc,
- libghc-echo-doc,
- libghc-exceptions-doc,
- libghc-extra-doc,
- libghc-file-embed-doc,
- libghc-filelock-doc,
- libghc-fsnotify-doc,
- libghc-generic-deriving-doc,
- libghc-hackage-security-doc,
- libghc-hashable-doc,
- libghc-hpack-doc,
- libghc-http-client-doc,
- libghc-http-client-tls-doc,
- libghc-http-conduit-doc,
- libghc-http-types-doc,
- libghc-memory-doc,
- libghc-microlens-doc,
- libghc-monad-logger-doc,
- libghc-mono-traversable-doc,
- libghc-mustache-doc,
- libghc-neat-interpolation-doc,
- libghc-network-uri-doc,
- libghc-open-browser-doc,
- libghc-optparse-applicative-doc,
- libghc-path-doc,
- libghc-path-io-doc,
- libghc-persistent-doc,
- libghc-persistent-sqlite-doc,
- libghc-persistent-template-doc,
- libghc-primitive-doc,
- libghc-project-template-doc,
- libghc-regex-applicative-text-doc,
- libghc-resourcet-doc,
- libghc-retry-doc,
- libghc-rio-doc,
- libghc-semigroups-doc,
- libghc-split-doc,
- libghc-store-doc,
- libghc-streaming-commons-doc,
- libghc-tar-doc,
- libghc-temporary-doc,
- libghc-text-metrics-doc,
- libghc-th-reify-many-doc,
- libghc-tls-doc,
- libghc-typed-process-doc,
- libghc-unicode-transforms-doc,
- libghc-unix-compat-doc,
- libghc-unliftio-doc,
- libghc-unordered-containers-doc,
- libghc-vector-doc,
- libghc-yaml-doc,
- libghc-zip-archive-doc,
- libghc-zlib-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: http://haskellstack.org
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-stack
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-stack]


=====================================
p/haskell-stack/debian/patches/newer-smallcheck deleted
=====================================
@@ -1,15 +0,0 @@
---- a/src/test/Stack/StoreSpec.hs
-+++ b/src/test/Stack/StoreSpec.hs
-@@ -51,12 +51,6 @@ addMinAndMaxBounds xs =
-     (if (minBound :: a) `notElem` xs then [minBound] else []) ++
-     (if (maxBound :: a) `notElem` xs && (maxBound :: a) /= minBound then maxBound : xs else xs)
- 
--$(do let ns = [ ''Int64, ''Word64, ''Word8
--              ]
--         f n = [d| instance Monad m => Serial m $(conT n) where
--                      series = generate (\_ -> addMinAndMaxBounds [0, 1]) |]
--     concat <$> mapM f ns)
--
- $(do let tys = [ ''InstalledCacheInner
-                -- FIXME , ''PackageCache
-                -- FIXME , ''LoadedSnapshot


=====================================
p/haskell-stack/debian/patches/remove-mintty.patch
=====================================
@@ -6,7 +6,7 @@ Index: b/stack.cabal
 ===================================================================
 --- a/stack.cabal
 +++ b/stack.cabal
-@@ -250,7 +250,6 @@ library
+@@ -255,7 +255,6 @@ library
      , http-types
      , memory
      , microlens
@@ -14,7 +14,7 @@ Index: b/stack.cabal
      , monad-logger
      , mono-traversable
      , mtl
-@@ -358,7 +357,6 @@ executable stack
+@@ -363,7 +362,6 @@ executable stack
      , http-types
      , memory
      , microlens
@@ -22,7 +22,7 @@ Index: b/stack.cabal
      , monad-logger
      , mono-traversable
      , mtl
-@@ -477,7 +475,6 @@ test-suite stack-integration-test
+@@ -482,7 +480,6 @@ test-suite stack-integration-test
      , http-types
      , memory
      , microlens
@@ -30,7 +30,7 @@ Index: b/stack.cabal
      , monad-logger
      , mono-traversable
      , mtl
-@@ -599,7 +596,6 @@ test-suite stack-test
+@@ -605,7 +602,6 @@ test-suite stack-test
      , http-types
      , memory
      , microlens


=====================================
p/haskell-stack/debian/patches/series
=====================================
@@ -1,2 +1 @@
 remove-mintty.patch
-newer-smallcheck


=====================================
p/haskell-stack/debian/rules
=====================================
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_ENABLE_TESTS = yes
-DEB_CABAL_PACKAGE = stack
-DEB_DEFAULT_COMPILER = ghc
+
+# Disable compile-time inclusion of current git info in stack
+DEB_SETUP_GHC_CONFIGURE_ARGS += -fdisable-git-info
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c569c3b3adf0be246c1daec799f849f09bd3aee2...7733079516a55182b2b8515ccaf00037026d9d9d

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/c569c3b3adf0be246c1daec799f849f09bd3aee2...7733079516a55182b2b8515ccaf00037026d9d9d
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/20200301/8617a2b5/attachment-0001.html>

More information about the Pkg-haskell-commits mailing list