[Git][haskell-team/DHG_packages][master] agda: Upgrading from 2.6.1 to 2.6.2.2
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Sat Aug 6 18:04:16 BST 2022
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
e539173b by Ilias Tsitsimpis at 2022-08-06T19:29:12+03:00
agda: Upgrading from 2.6.1 to 2.6.2.2
- - - - -
4 changed files:
- p/agda/debian/changelog
- p/agda/debian/control
- p/agda/debian/libghc-agda-dev.install
- p/agda/debian/patches/var-lib-agda
Changes:
=====================================
p/agda/debian/changelog
=====================================
@@ -1,8 +1,10 @@
-agda (2.6.1-2) UNRELEASED; urgency=medium
+agda (2.6.2.2-1) unstable; urgency=medium
+ * New upstream release (Closes: #1003318)
* Declare compliance with Debian policy 4.6.1
+ * Install missing files (Closes: #1008809, #992448)
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:31:58 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sat, 06 Aug 2022 16:14:08 +0300
agda (2.6.1-1) unstable; urgency=medium
=====================================
p/agda/debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
haskell-devscripts (>= 0.13),
ghc-prof,
libghc-aeson-dev (>= 1.1.2.0),
- libghc-aeson-dev (<< 1.5),
+ libghc-aeson-dev (<< 2.1),
libghc-aeson-prof,
libghc-async-dev (>= 2.2),
libghc-async-dev (<< 2.3),
@@ -22,31 +22,38 @@ Build-Depends:
libghc-blaze-html-dev (<< 0.10),
libghc-boxes-dev (>= 0.1.3),
libghc-boxes-dev (<< 0.2),
- libghc-boxes-dev (>= 0.1.3),
+ libghc-boxes-prof,
+ libghc-case-insensitive-dev (>= 1.2.0.4),
+ libghc-case-insensitive-dev (<< 1.3),
+ libghc-case-insensitive-prof,
+ libghc-data-hash-dev (>= 0.2.0.0),
libghc-data-hash-dev (<< 0.3),
libghc-data-hash-dev (>= 0.2.0.0),
libghc-edit-distance-dev (<< 0.3),
libghc-equivalence-dev (>= 0.3.2),
- libghc-equivalence-dev (<< 0.4),
+ libghc-equivalence-dev (<< 0.5),
libghc-equivalence-prof,
libghc-exceptions-dev (>= 0.8),
libghc-exceptions-dev (<< 0.11),
libghc-exceptions-prof,
- libghc-geniplate-mirror-dev (>= 0.6.0.6),
- libghc-geniplate-mirror-dev (<< 0.8),
libghc-gitrev-dev (>= 1.3.1),
libghc-gitrev-dev (<< 2.0),
libghc-gitrev-prof,
libghc-hashable-dev (>= 1.2.1.0),
- libghc-hashable-dev (<< 1.4),
+ libghc-hashable-dev (<< 1.5),
libghc-hashable-prof,
libghc-hashtables-dev (>= 1.2.0.2),
- libghc-hashtables-dev (<< 1.3),
- libghc-ieee754-dev (>= 0.7.8),
- libghc-ieee754-dev (<< 0.9),
+ libghc-hashtables-dev (<< 1.4),
+ libghc-hashtables-prof,
+ libghc-monad-control-dev (>= 1.0.1.0),
+ libghc-monad-control-dev (<< 1.1),
+ libghc-monad-control-prof,
libghc-murmur-hash-dev (>= 0.1),
libghc-murmur-hash-dev (<< 0.2),
libghc-murmur-hash-prof,
+ libghc-parallel-dev (>= 3.2.2.0),
+ libghc-parallel-dev (<< 3.3),
+ libghc-parallel-prof,
libghc-regex-tdfa-dev (>= 1.3.1.0),
libghc-regex-tdfa-dev (<< 1.4),
libghc-regex-tdfa-prof,
@@ -54,7 +61,8 @@ Build-Depends:
libghc-split-dev (<< 0.2.4),
libghc-split-prof,
libghc-strict-dev (>= 0.3.2),
- libghc-strict-dev (<< 0.4),
+ libghc-strict-dev (<< 0.5),
+ libghc-strict-prof,
libghc-unordered-containers-dev (>= 0.2.5.0),
libghc-unordered-containers-dev (<< 0.3),
libghc-uri-encode-dev (>= 1.5.0.4),
@@ -69,16 +77,17 @@ Build-Depends-Indep: ghc-doc,
libghc-async-doc,
libghc-blaze-html-doc,
libghc-boxes-doc,
+ libghc-case-insensitive-doc,
libghc-data-hash-doc,
libghc-edit-distance-doc,
libghc-equivalence-doc,
libghc-exceptions-doc,
- libghc-geniplate-mirror-doc,
libghc-gitrev-doc,
libghc-hashable-doc,
libghc-hashtables-doc,
- libghc-ieee754-doc,
+ libghc-monad-control-doc,
libghc-murmur-hash-doc,
+ libghc-parallel-doc,
libghc-regex-tdfa-doc,
libghc-split-doc,
libghc-strict-doc,
=====================================
p/agda/debian/libghc-agda-dev.install
=====================================
@@ -1,2 +1,4 @@
-debian/tmp-inst-ghc/usr/share/libghc-agda-dev/Agda.css usr/share/libghc-agda-dev/
+debian/tmp-inst-ghc/usr/share/libghc-agda-dev/html usr/share/libghc-agda-dev
debian/tmp-inst-ghc/usr/share/libghc-agda-dev/lib usr/share/libghc-agda-dev
+debian/tmp-inst-ghc/usr/share/libghc-agda-dev/MAlonzo usr/share/libghc-agda-dev
+debian/tmp-inst-ghc/usr/share/libghc-agda-dev/JS usr/share/libghc-agda-dev
=====================================
p/agda/debian/patches/var-lib-agda
=====================================
@@ -4,17 +4,20 @@ Index: b/src/full/Agda/Interaction/Library.hs
===================================================================
--- a/src/full/Agda/Interaction/Library.hs
+++ b/src/full/Agda/Interaction/Library.hs
-@@ -280,13 +280,19 @@ getInstalledLibraries
+@@ -300,16 +300,22 @@ getInstalledLibraries
-> LibM [AgdaLibFile] -- ^ Content of library files. (Might have empty @LibName at s.)
getInstalledLibraries overrideLibFile = mkLibM [] $ do
- file <- lift $ getLibrariesFile overrideLibFile
-- if not (lfExists file) then return [] else do
-+ userlibs <- if not (lfExists file) then return [] else do
- ls <- lift $ stripCommentLines <$> readFile (lfPath file)
- files <- lift $ sequence [ (i, ) <$> expandEnvironmentVariables s | (i, s) <- ls ]
- parseLibFiles (Just file) $ nubOn snd files
-+ systemlibs <- ifNotM (lift $ doesDirectoryExist systemLibDir) (return []) $ do
-+ files <- lift $ filter isLibFile <$> listDirectory systemLibDir
+ filem <- liftIO $ runExceptT $ getLibrariesFile overrideLibFile
+- case filem of
++ userlibs <- case filem of
+ Left err -> raiseErrors' [OtherError err] >> return []
+ Right file -> do
+ if not (lfExists file) then return [] else do
+ ls <- liftIO $ stripCommentLines <$> UTF8.readFile (lfPath file)
+ files <- liftIO $ sequence [ (i, ) <$> expandEnvironmentVariables s | (i, s) <- ls ]
+ parseLibFiles (Just file) $ nubOn snd files
++ systemlibs <- ifNotM (liftIO $ doesDirectoryExist systemLibDir) (return []) $ do
++ files <- liftIO $ filter isLibFile <$> listDirectory systemLibDir
+ parseLibFiles Nothing $ zip [1..] $ map (systemLibDir </>) files
+ return $ userlibs ++ systemlibs
`catchIO` \ e -> do
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/e539173b8be38dfcea95e4ed5e77f110f0a882b7
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/e539173b8be38dfcea95e4ed5e77f110f0a882b7
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/20220806/e1cbcdf8/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list