From 5f55525e54b29439dded5745656aa919a88b557e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Aug 2017 17:43:38 -0400 Subject: Windows: Win32 package has subsumed Win32-extras; update dependency. --- CHANGELOG | 1 + git-annex.cabal | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 96107ad7f..1d5472343 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ git-annex (6.20170521) UNRELEASED; urgency=medium * Disable http-client's default 30 second response timeout when HEADing an url to check if it exists. Some web servers take quite a long time to answer a HEAD request. + * Windows: Win32 package has subsumed Win32-extras; update dependency. -- Joey Hess Sat, 17 Jun 2017 13:02:24 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index ad0ef9271..8ac15c64d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -385,7 +385,7 @@ Executable git-annex Build-Depends: network (< 2.6), network (>= 2.4) if (os(windows)) - Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv, + Build-Depends: Win32 (>= 2.5), unix-compat (>= 0.4.1.3), setenv, process (>= 1.4.2.0) else Build-Depends: unix -- cgit v1.2.3