[Git][haskell-team/DHG_packages][master] Agda: Upgrading from 2.5.4.1 to 2.6.0.1

[Clint Adams]

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


Commits:
1deafa31 by Clint Adams at 2019-08-31T14:09:23Z
Agda: Upgrading from 2.5.4.1 to 2.6.0.1

- - - - -


3 changed files:

- p/agda/debian/changelog
- p/agda/debian/control
- p/agda/debian/patches/var-lib-agda


Changes:

=====================================
p/agda/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+agda (2.6.0.1-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 31 Aug 2019 10:02:33 -0400
+
 agda (2.5.4.1-3) unstable; urgency=medium
 
   * Remove build dependency on non-existing libghc-edisoncore-dev.


=====================================
p/agda/debian/control
=====================================
@@ -12,6 +12,12 @@ Build-Depends:
  ghc (>= 8.4.3),
  happy,
  haskell-devscripts (>= 0.13),
+ ghc-prof,
+ libghc-edison-core-dev,
+ libghc-edison-core-prof,
+ libghc-aeson-dev (>= 0.11.3.0),
+ libghc-aeson-dev (<< 1.5),
+ libghc-aeson-prof,
  libghc-async-dev (>= 2.2),
  libghc-async-dev (<< 2.3),
  libghc-blaze-html-dev (>= 0.8),
@@ -21,14 +27,14 @@ Build-Depends:
  libghc-boxes-dev (>= 0.1.3),
  libghc-data-hash-dev (<< 0.3),
  libghc-data-hash-dev (>= 0.2.0.0),
- libghc-edison-core-dev (>= 1.3.2.1),
- libghc-edison-core-dev (<< 1.4),
  libghc-edit-distance-dev (<< 0.3),
  libghc-equivalence-dev (>= 0.3.2),
  libghc-equivalence-dev (<< 0.4),
- libghc-equivalence-dev (>= 0.2.5),
- libghc-filemanip-dev (<< 0.4),
- libghc-filemanip-dev (>= 0.3.6.3),
+ 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),
@@ -42,6 +48,10 @@ Build-Depends:
  libghc-murmur-hash-dev (<< 0.2),
  libghc-regex-tdfa-dev (>= 1.2.2),
  libghc-regex-tdfa-dev (<< 1.3),
+ libghc-regex-tdfa-prof,
+ libghc-split-dev (>= 0.2.0.0),
+ libghc-split-dev (<< 0.2.3.4),
+ libghc-split-prof,
  libghc-strict-dev (>= 0.3.2),
  libghc-strict-dev (<< 0.4),
  libghc-unordered-containers-dev (>= 0.2.5.0),
@@ -54,12 +64,14 @@ Build-Depends:
  happy,
 Build-Depends-Indep: ghc-doc,
  libghc-edison-core-doc,
+ libghc-aeson-doc,
  libghc-async-doc,
  libghc-blaze-html-doc,
  libghc-boxes-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,
@@ -67,11 +79,12 @@ Build-Depends-Indep: ghc-doc,
  libghc-ieee754-doc,
  libghc-murmur-hash-doc,
  libghc-regex-tdfa-doc,
+ libghc-split-doc,
  libghc-strict-doc,
  libghc-unordered-containers-doc,
  libghc-uri-encode-doc,
  libghc-zlib-doc,
-Standards-Version: 4.1.4
+Standards-Version: 4.4.0
 Homepage: http://wiki.portal.chalmers.se/agda/
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/agda
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/agda]


=====================================
p/agda/debian/patches/var-lib-agda
=====================================
@@ -1,10 +1,8 @@
 See https://github.com/agda/agda/issues/2804
 
-Index: b/src/full/Agda/Interaction/Library.hs
-===================================================================
 --- a/src/full/Agda/Interaction/Library.hs
 +++ b/src/full/Agda/Interaction/Library.hs
-@@ -225,13 +225,19 @@ getInstalledLibraries
+@@ -267,13 +267,19 @@
    -> LibM [AgdaLibFile] -- ^ Content of library files.  (Might have empty @LibName at s.)
  getInstalledLibraries overrideLibFile = mkLibM [] $ do
      file <- lift $ getLibrariesFile overrideLibFile
@@ -12,13 +10,13 @@ Index: b/src/full/Agda/Interaction/Library.hs
 +    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) files
+       parseLibFiles (Just file) $ List.nubBy ((==) `on` snd) files
 +    systemlibs <- ifNotM (lift $ doesDirectoryExist systemLibDir) (return []) $ do
 +      files <- lift $ filter isLibFile <$> listDirectory systemLibDir
 +      parseLibFiles Nothing $ zip [1..] $ map (systemLibDir </>) files
 +    return $ userlibs ++ systemlibs
    `catchIO` \ e -> do
-     tell [ OtherError $ unlines ["Failed to read installed libraries.", show e] ]
+     raiseErrors' [ OtherError $ unlines ["Failed to read installed libraries.", show e] ]
      return []
 +  where systemLibDir = "/var/lib/agda"
 +        isLibFile fn = takeExtension fn == ".agda-lib" && not ("." `List.isPrefixOf` fn)



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/1deafa310ce0eab43f1ec263bfdacef9992393c7
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/20190831/5e378ebb/attachment-0001.html>