From e57738bb141c56d083436df20f1f2a8440837ffa Mon Sep 17 00:00:00 2001
From: Ryan Thomas <ryan@ryant.org>
Date: Mon, 1 Feb 2016 08:39:34 +1100
Subject: [PATCH] Bump cabal-install version number to v1.20.2.0
---
cabal-install/bootstrap.sh | 2 +-
cabal-install/cabal-install.cabal | 2 +-
cabal-install/changelog | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 4439bb12bc..25243e2316 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -126,7 +126,7 @@ TEXT_VER="1.1.0.1"; TEXT_VER_REGEXP="((1\.[01]\.)|(0\.([2-9]|(1[0-1]))\.))"
# >= 0.2 && < 1.2
NETWORK_VER="2.4.2.3"; NETWORK_VER_REGEXP="2\.[0-5]\."
# >= 2.0 && < 2.6
-CABAL_VER="1.20.0.3"; CABAL_VER_REGEXP="1\.2[01]\."
+CABAL_VER="1.20.0.4"; CABAL_VER_REGEXP="1\.2[01]\."
# >= 1.20 && < 1.21
TRANS_VER="0.3.0.0"; TRANS_VER_REGEXP="0\.[23]\."
# >= 0.2.* && < 0.4.*
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index d45082e065..551f036519 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
Name: cabal-install
-Version: 1.20.1.0
+Version: 1.20.2.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-install/changelog b/cabal-install/changelog
index f564a0ab6a..f65b2698fe 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,8 @@
-*-change-log-*-
+1.20.2.0 Ryan Thomas <ryan@ryant.org> February 2016
+ * Only Custom setup scripts should be compiled with '-i -i.'.
+ * installedCabalVersion: Don't special-case Cabal anymore.
+
1.20.1.0 Ryan Thomas <ryan@ryant.org> May 2015
* Force cabal upload to always use digest auth and never basic auth.
* bootstrap.sh: install network-uri before HTTP
--
GitLab