[Git][haskell-team/DHG_packages][master] criterion: Upgrading from 1.5.6.2 to 1.5.13.0
Clint Adams (@clint)
gitlab at salsa.debian.org
Mon Aug 15 20:33:19 BST 2022
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
392d430e by Clint Adams at 2022-08-15T15:32:21-04:00
criterion: Upgrading from 1.5.6.2 to 1.5.13.0
- - - - -
4 changed files:
- p/haskell-criterion/debian/changelog
- p/haskell-criterion/debian/control
- + p/haskell-criterion/debian/patches/no-js-chart
- + p/haskell-criterion/debian/patches/series
Changes:
=====================================
p/haskell-criterion/debian/changelog
=====================================
@@ -1,9 +1,13 @@
-haskell-criterion (1.5.6.2-2) UNRELEASED; urgency=medium
+haskell-criterion (1.5.13.0-1) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
* Remove retired developer, Joachim Breitner, from Uploaders.
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:32:11 +0300
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Mon, 15 Aug 2022 15:19:01 -0400
haskell-criterion (1.5.6.2-1) unstable; urgency=medium
=====================================
p/haskell-criterion/debian/control
=====================================
@@ -6,17 +6,20 @@ Priority: optional
Section: haskell
Rules-Requires-Root: no
Build-Depends:
+ haskell-devscripts (>= 0.13),
cdbs,
debhelper (>= 10),
ghc (>= 8.4.3),
ghc-prof,
- haskell-devscripts (>= 0.13),
- libghc-aeson-dev (>= 0.8),
+ libghc-glob-dev (>= 0.7.2),
+ libghc-glob-prof,
+ libghc-aeson-dev (>= 1),
+ libghc-aeson-dev (<< 2.1),
libghc-aeson-prof,
libghc-ansi-wl-pprint-dev (>= 0.6.7.2),
libghc-ansi-wl-pprint-prof,
libghc-base-compat-batteries-dev (>= 0.10),
- libghc-base-compat-batteries-dev (<< 0.12),
+ libghc-base-compat-batteries-dev (<< 0.13),
libghc-base-compat-batteries-prof,
libghc-binary-orphans-dev (>= 1.0.1),
libghc-binary-orphans-dev (<< 1.1),
@@ -33,16 +36,13 @@ Build-Depends:
libghc-exceptions-dev (>= 0.8.2),
libghc-exceptions-dev (<< 0.11),
libghc-exceptions-prof,
- libghc-js-flot-dev,
- libghc-js-flot-prof,
- libghc-js-jquery-dev,
- libghc-js-jquery-prof,
libghc-microstache-dev (>= 1.0.1),
libghc-microstache-dev (<< 1.1),
libghc-microstache-prof,
libghc-mwc-random-dev (>= 0.8.0.3),
libghc-mwc-random-prof,
libghc-optparse-applicative-dev (>= 0.13),
+ libghc-optparse-applicative-dev (<< 0.18),
libghc-optparse-applicative-prof,
libghc-statistics-dev (>= 0.14),
libghc-statistics-dev (<< 0.16),
@@ -62,8 +62,6 @@ Build-Depends-Indep: ghc-doc,
libghc-code-page-doc,
libghc-criterion-measurement-doc,
libghc-exceptions-doc,
- libghc-js-flot-doc,
- libghc-js-jquery-doc,
libghc-microstache-doc,
libghc-mwc-random-doc,
libghc-optparse-applicative-doc,
@@ -71,6 +69,7 @@ Build-Depends-Indep: ghc-doc,
libghc-transformers-compat-doc,
libghc-vector-algorithms-doc,
libghc-vector-doc,
+ libjs-chart.js,
Standards-Version: 4.6.1
Homepage: http://www.serpentine.com/criterion
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-criterion
=====================================
p/haskell-criterion/debian/patches/no-js-chart
=====================================
@@ -0,0 +1,44 @@
+--- a/Criterion/EmbeddedData.hs
++++ b/Criterion/EmbeddedData.hs
+@@ -20,10 +20,9 @@ module Criterion.EmbeddedData
+ import Data.ByteString (ByteString)
+ import Data.FileEmbed (embedDir, embedFile)
+ import Language.Haskell.TH.Syntax (runIO)
+-import qualified Language.Javascript.Chart as Chart
+
+ dataFiles :: [(FilePath, ByteString)]
+ dataFiles = $(embedDir "templates")
+
+ chartContents :: ByteString
+-chartContents = $(embedFile =<< runIO (Chart.file Chart.Chart))
++chartContents = $(embedFile "/usr/share/javascript/chart.js/Chart.js")
+--- a/Criterion/Report.hs
++++ b/Criterion/Report.hs
+@@ -66,8 +66,6 @@ import qualified Data.Vector.Unboxed as
+ import Criterion.EmbeddedData (dataFiles, chartContents)
+ import qualified Data.ByteString.Lazy as BL
+ import qualified Data.Text.Encoding as TE
+-#else
+-import qualified Language.Javascript.Chart as Chart
+ #endif
+
+ #if MIN_VERSION_aeson(2,0,0)
+@@ -181,7 +179,7 @@ formatReport reports templateName = do
+ #if defined(EMBED)
+ chartFileContents = pure $ TE.decodeUtf8 chartContents
+ #else
+- chartFileContents = T.readFile =<< Chart.file Chart.Chart
++ chartFileContents = T.readFile "/usr/share/javascript/chart.js/Chart.js"
+ #endif
+
+ readDataFile :: FilePath -> IO T.Text
+--- a/criterion.cabal
++++ b/criterion.cabal
+@@ -101,7 +101,6 @@ library
+ filepath,
+ Glob >= 0.7.2,
+ microstache >= 1.0.1 && < 1.1,
+- js-chart >= 2.9.4 && < 3,
+ mtl >= 2,
+ mwc-random >= 0.8.0.3,
+ -- TODO: Depend on optparse-applicative-0.17 as the minimum (see #258)
=====================================
p/haskell-criterion/debian/patches/series
=====================================
@@ -0,0 +1 @@
+no-js-chart
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/392d430e348590dafb3b768b156802550573a8d7
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/392d430e348590dafb3b768b156802550573a8d7
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/20220815/1caba6c4/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list