[Git][haskell-team/DHG_packages][experimental] 14 commits: ghc: upload to sid

Clint Adams (@clint) gitlab at salsa.debian.org
Tue Aug 24 12:33:50 BST 2021



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


Commits:
a2580c80 by Gianfranco Costamagna at 2020-12-23T23:28:40+01:00
ghc: upload to sid

- - - - -
6b67cfd3 by Clint Adams at 2021-01-01T17:39:45-05:00
hOpenPGP: Upgrading from 2.9.4 to 2.9.5

- - - - -
bff16945 by Clint Adams at 2021-01-01T18:13:59-05:00
hopenpgp-tools: Upgrading from 0.23.1 to 0.23.5

- - - - -
8f8a96d2 by Clint Adams at 2021-01-02T19:51:51-05:00
hopenpgp-tools: Upgrading from 0.23.5 to 0.23.6

- - - - -
ecce5af2 by Gianfranco Costamagna at 2021-05-01T08:24:42+02:00
haskell-hoogle: update to new release to trigger new fresh armhf tests

- - - - -
6137ae6d by Gianfranco Costamagna at 2021-06-15T10:46:41+02:00
haskell-hoogle: revert upstream PR 339 to fix an armhf index corruption bug

- - - - -
1202dac2 by Kei Hibino at 2021-07-14T18:18:01+09:00
relational-record: re-add metapackage

- - - - -
2d994493 by Samuel Henrique at 2021-08-14T17:33:52+01:00
ShellCheck: Upgrading from 0.7.1 to 0.7.2

- - - - -
38e8d0cf by Samuel Henrique at 2021-08-14T17:58:59+01:00
Shellcheck: Bump Standards-Version to 4.5.1

- - - - -
21242345 by Samuel Henrique at 2021-08-14T17:58:59+01:00
Shellcheck: Bump d/watch to v4

- - - - -
3eed1029 by Samuel Henrique at 2021-08-14T18:03:27+01:00
Shellcheck: Update changelog

- - - - -
fe907a4d by Samuel Henrique at 2021-08-15T18:11:32+01:00
Shellcheck: Fix manpage generation (closes: #918555, #985003)

- - - - -
82104e37 by Samuel Henrique at 2021-08-15T18:13:06+01:00
Shellcheck: Finalize changelog for 0.7.2-2 unstable upload

- - - - -
263f6d4d by Clint Adams at 2021-08-24T07:33:12-04:00
Merge branch 'master' into experimental

- - - - -


14 changed files:

- p/haskell-hoogle/debian/changelog
- + p/haskell-hoogle/debian/patches/339-revert.patch
- p/haskell-hoogle/debian/patches/global_database
- p/haskell-hoogle/debian/patches/series
- p/haskell-hopenpgp-tools/debian/changelog
- p/haskell-hopenpgp-tools/debian/control
- p/haskell-hopenpgp/debian/changelog
- p/haskell-hopenpgp/debian/control
- p/haskell-relational-record/debian/changelog
- p/haskell-relational-record/debian/control
- p/shellcheck/debian/changelog
- p/shellcheck/debian/control
- p/shellcheck/debian/rules
- p/shellcheck/debian/watch


Changes:

=====================================
p/haskell-hoogle/debian/changelog
=====================================
@@ -1,3 +1,16 @@
+haskell-hoogle (5.0.18.1+dfsg1-2) unstable; urgency=medium
+
+  * Revert upstream pull request 339 (Addresses: #971832)
+    to fix an armhf corruption bug (see upstream issue #359)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 11 May 2021 09:37:01 +0200
+
+haskell-hoogle (5.0.18.1+dfsg1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 01 May 2021 08:18:33 +0200
+
 haskell-hoogle (5.0.18+dfsg1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/haskell-hoogle/debian/patches/339-revert.patch
=====================================
@@ -0,0 +1,65 @@
+Description: Revert https://github.com/ndmitchell/hoogle/pull/339/files to possibly fix https://github.com/ndmitchell/hoogle/issues/359
+
+--- haskell-hoogle-5.0.18.1+dfsg1.orig/src/Output/Types.hs
++++ haskell-hoogle-5.0.18.1+dfsg1/src/Output/Types.hs
+@@ -128,15 +128,11 @@ searchFingerprintsDebug store query answ
+ 
+ data TypesNames a where TypesNames :: TypesNames (BStr0, V.Vector Name) deriving Typeable
+ 
+--- At around 7000 packages, Word16 becomes insufficient
+--- because there are more than 2^16 Names, so we use Word32.
+-type NameWord = Word32
+-
+ -- Must be a unique Name per String.
+ -- First 0-99 are variables, rest are constructors.
+ -- More popular type constructors have higher numbers.
+ -- There are currently about 14K names, so about 25% of the bit patterns are taken
+-newtype Name = Name NameWord deriving (Eq,Ord,Show,Data,Typeable,Storable,Binary)
++newtype Name = Name Word16 deriving (Eq,Ord,Show,Data,Typeable,Storable,Binary)
+ 
+ name0 = Name 0 -- use to represent _
+ 
+@@ -154,7 +150,7 @@ prettyName x@(Name i)
+ -- | Give a name a popularity, where 0 is least popular, 1 is most popular
+ popularityName :: Name -> Double
+ popularityName (Name n) | isVar $ Name n = error "Can't call popularityName on a Var"
+-                        | otherwise = fromIntegral (n - 100) / fromIntegral (maxBound - 100 :: NameWord)
++                        | otherwise = fromIntegral (n - 100) / fromIntegral (maxBound - 100 :: Word16)
+ 
+ newtype Names = Names {lookupName :: Str -> Maybe Name}
+ 
+@@ -194,10 +190,10 @@ spreadNames [] = []
+ spreadNames (sortOn (negate . snd) -> xs@((_,limit):_)) = check $ f (99 + fromIntegral (length xs)) maxBound xs
+     where
+         check xs | all (isCon . snd) xs && length (nubOrd $ map snd xs) == length xs = xs
+-                 | otherwise = error $ "Invalid spreadNames, length=" ++ show (length xs)
++                 | otherwise = error "Invalid spreadNames"
+ 
+         -- I can only assign values between mn and mx inclusive
+-        f :: NameWord -> NameWord -> [(a, Int)] -> [(a, Name)]
++        f :: Word16 -> Word16 -> [(a, Int)] -> [(a, Name)]
+         f !mn !mx [] = []
+         f mn mx ((a,i):xs) = (a, Name real) : f (mn-1) (real-1) xs
+             where real = fromIntegral $ max mn $ min mx ideal
+@@ -266,16 +262,14 @@ fpRaresFold :: (b -> b -> b) -> (Name ->
+ fpRaresFold g f Fingerprint{..} = f fpRare1 `g` f fpRare2 `g` f fpRare3
+ 
+ instance Storable Fingerprint where
+-    sizeOf _ = 3*sizeOf name0 + 2
++    sizeOf _ = 64
+     alignment _ = 4
+     peekByteOff ptr i = Fingerprint
+-        <$> peekByteOff ptr (i+0) <*> peekByteOff ptr (i+1*w) <*> peekByteOff ptr (i+2*w)
+-        <*> peekByteOff ptr (i+3*w) <*> peekByteOff ptr (i+3*w + 1)
+-        where w = sizeOf name0
++        <$> peekByteOff ptr (i+0) <*> peekByteOff ptr (i+2) <*> peekByteOff ptr (i+4)
++        <*> peekByteOff ptr (i+6) <*> peekByteOff ptr (i+7)
+     pokeByteOff ptr i Fingerprint{..} = do
+-        pokeByteOff ptr (i+0) fpRare1 >> pokeByteOff ptr (i+1*w) fpRare2 >> pokeByteOff ptr (i+2*w) fpRare3
+-        pokeByteOff ptr (i+3*w) fpArity >> pokeByteOff ptr (i+3*w + 1) fpTerms
+-        where w = sizeOf name0
++        pokeByteOff ptr (i+0) fpRare1 >> pokeByteOff ptr (i+2) fpRare2 >> pokeByteOff ptr (i+4) fpRare3
++        pokeByteOff ptr (i+6) fpArity >> pokeByteOff ptr (i+7) fpTerms
+ 
+ toFingerprint :: Sig Name -> Fingerprint
+ toFingerprint sig = Fingerprint{..}


=====================================
p/haskell-hoogle/debian/patches/global_database
=====================================
@@ -6,7 +6,7 @@ Forwarded: no, Debian specific
 
 --- a/src/Action/CmdLine.hs
 +++ b/src/Action/CmdLine.hs
-@@ -86,8 +86,16 @@
+@@ -87,8 +87,16 @@
      args <- withArgs args $ cmdArgsRun cmdLineMode
  
      -- fill in the default database


=====================================
p/haskell-hoogle/debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 global_database
 remove_embedded_copies
+339-revert.patch


=====================================
p/haskell-hopenpgp-tools/debian/changelog
=====================================
@@ -1,3 +1,23 @@
+haskell-hopenpgp-tools (0.23.6-1) unstable; urgency=medium
+
+  * New upstream version.
+    - hokey lint: do not complain about ECDH keys of >= 256 bits.
+      closes: #979028.
+
+ -- Clint Adams <clint at debian.org>  Sat, 02 Jan 2021 19:50:55 -0500
+
+haskell-hopenpgp-tools (0.23.5-1) unstable; urgency=medium
+
+  * New upstream version.
+    - hokey lint: warn about some cryptographic weaknesses
+      related to subkeys.  closes: #812944.
+    - hokey lint: check both hashed and unhashed signature
+      subpackets for embedded cross-signatures.  closes: #978990.
+    - hokey lint: do not complain about EdDSA keys of 256-bit size.
+      closes: #978991.
+
+ -- Clint Adams <clint at debian.org>  Fri, 01 Jan 2021 18:03:39 -0500
+
 haskell-hopenpgp-tools (0.23.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/haskell-hopenpgp-tools/debian/control
=====================================
@@ -9,55 +9,39 @@ Build-Depends:
  alex,
  cdbs,
  debhelper (>= 10),
- ghc (>= 8.4.3),
+ ghc (>= 8.6),
  happy,
  haskell-devscripts (>= 0.13),
  help2man,
  libghc-aeson-dev,
- libghc-aeson-prof,
- libghc-attoparsec-dev (>= 0.10.0.0),
  libghc-base16-bytestring-dev,
  libghc-binary-conduit-dev,
- libghc-binary-conduit-prof,
  libghc-conduit-dev (>= 1.3.0),
- libghc-conduit-prof,
  libghc-conduit-extra-dev (>= 1.1),
- libghc-crypto-pubkey-dev,
- libghc-cryptohash-dev (>= 0.7.7),
- libghc-cryptohash-prof,
  libghc-cryptonite-dev,
- libghc-cryptonite-prof,
  libghc-errors-dev,
  libghc-fgl-dev (>= 5.5.4.0),
  libghc-graphviz-dev,
- libghc-graphviz-prof,
- libghc-hopenpgp-dev (>= 2.9),
+ libghc-hopenpgp-dev (>= 2.9.5),
  libghc-hopenpgp-dev (<< 3),
- libghc-hopenpgp-prof,
  libghc-http-client-dev (>= 0.4.30),
- libghc-http-client-prof,
  libghc-http-client-tls-dev,
  libghc-http-types-dev,
  libghc-ixset-typed-dev,
  libghc-lens-dev,
+ libghc-memory-dev,
  libghc-monad-loops-dev,
  libghc-openpgp-asciiarmor-dev (>= 0.1),
  libghc-optparse-applicative-dev (>= 0.11.0),
- libghc-optparse-applicative-prof,
  libghc-prettyprinter-dev,
- libghc-prettyprinter-prof,
  libghc-prettyprinter-ansi-terminal-dev,
- libghc-prettyprinter-ansi-terminal-prof,
  libghc-prettyprinter-convert-ansi-wl-pprint-dev,
- libghc-prettyprinter-convert-ansi-wl-pprint-prof,
  libghc-resourcet-dev,
  libghc-time-locale-compat-dev,
  libghc-unordered-containers-dev,
- libghc-unordered-containers-prof,
  libghc-vector-dev,
- libghc-vector-prof,
  libghc-yaml-dev,
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
 Homepage: https://salsa.debian.org/clint/hOpenPGP-tools
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-hopenpgp-tools
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-hopenpgp-tools]


=====================================
p/haskell-hopenpgp/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hopenpgp (2.9.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Fri, 01 Jan 2021 17:39:13 -0500
+
 haskell-hopenpgp (2.9.4-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/haskell-hopenpgp/debian/control
=====================================
@@ -52,16 +52,12 @@ Build-Depends:
  libghc-nettle-prof,
  libghc-network-uri-dev (>= 2.6),
  libghc-network-uri-prof,
- libghc-newtype-dev,
- libghc-newtype-prof,
  libghc-openpgp-asciiarmor-dev (>= 0.1),
  libghc-openpgp-asciiarmor-prof,
  libghc-prettyprinter-dev,
  libghc-prettyprinter-prof,
  libghc-resourcet-dev (>> 0.4),
  libghc-resourcet-prof,
- libghc-semigroups-dev,
- libghc-semigroups-prof,
  libghc-split-dev,
  libghc-split-prof,
  libghc-tasty-dev,
@@ -105,11 +101,9 @@ Build-Depends-Indep: ghc-doc,
  libghc-monad-loops-doc,
  libghc-nettle-doc,
  libghc-network-uri-doc,
- libghc-newtype-doc,
  libghc-openpgp-asciiarmor-doc,
  libghc-prettyprinter-doc,
  libghc-resourcet-doc,
- libghc-semigroups-doc,
  libghc-split-doc,
  libghc-time-locale-compat-doc,
  libghc-unliftio-core-doc,


=====================================
p/haskell-relational-record/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-relational-record (0.2.2.0-6) unstable; urgency=medium
+
+  * Re-add metapackage for handy installation.
+
+ -- Kei Hibino <ex8k.hibino at gmail.com>  Wed, 14 Jul 2021 18:09:19 +0900
+
 haskell-relational-record (0.2.2.0-5) unstable; urgency=medium
 
   * Sourceful post-NEW upload


=====================================
p/haskell-relational-record/debian/control
=====================================
@@ -34,6 +34,21 @@ Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-relat
 X-Description: metapackage of Relational Record
  metapackage to install Relational Record quickly
 
+Package: haskell-relational-record
+Architecture: all
+Depends:
+ libghc-relational-record-dev,
+ libghc-relational-record-doc,
+ libghc-relational-record-prof,
+ ${misc:Depends},
+Description: Haskell Relational Record libraries
+ Haskell Relational Record is a query generator based on typed relational
+ algebra and correspondence between SQL value lists and Haskell record types,
+ which provide programming interfaces to Relational Database Management Systems.
+ .
+ Installing this meta package will also install the Debian packages containing
+ relational-record hackage libraries modules and documents.
+
 Package: libghc-relational-record-dev
 Architecture: any
 Depends:


=====================================
p/shellcheck/debian/changelog
=====================================
@@ -1,3 +1,17 @@
+shellcheck (0.7.2-2) unstable; urgency=medium
+
+  * d/rules: Fix manpage generation (closes: #918555, #985003)
+
+ -- Samuel Henrique <samueloph at debian.org>  Sun, 15 Aug 2021 18:12:05 +0100
+
+shellcheck (0.7.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.5.1
+  * Bump d/watch to v4
+
+ -- Samuel Henrique <samueloph at debian.org>  Sat, 14 Aug 2021 17:33:52 +0100
+
 shellcheck (0.7.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/shellcheck/debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 10),
  libghc-regex-tdfa-dev,
  libghc-regex-tdfa-prof,
  pandoc,
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
 Homepage: https://www.shellcheck.net/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/shellcheck
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/shellcheck]


=====================================
p/shellcheck/debian/rules
=====================================
@@ -17,5 +17,5 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
 common-build-arch::
-	pandoc -s -t man shellcheck.1.md -o shellcheck.1
+	pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1
 common-binary-arch:: check-ghc-stamp


=====================================
p/shellcheck/debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://hackage.haskell.org/package/ShellCheck/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/bd93bcb0f64e9f2459e8c023cb17cf24bafc6961...263f6d4db8cd2bd1ec6e9a5f6ce8342e0a9f200a

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/bd93bcb0f64e9f2459e8c023cb17cf24bafc6961...263f6d4db8cd2bd1ec6e9a5f6ce8342e0a9f200a
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/20210824/ac6068f7/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list