From 397f18a298bd3fc9c69f77cf00a9a56a693f748e Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Wed, 28 Nov 2018 13:36:11 +0100
Subject: remove custom-binary flag; update Cabal version restriction; bump
 version to 3.10

---
 gf.cabal | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'gf.cabal')

diff --git a/gf.cabal b/gf.cabal
index bd1b04171..494f483eb 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -1,5 +1,5 @@
 name: gf
-version: 3.9-git
+version: 3.10
 
 cabal-version: >= 1.22
 build-type: Custom
@@ -42,7 +42,7 @@ data-files:
 custom-setup
   setup-depends:
     base,
-    Cabal >=1.4.0.0,
+    Cabal >=1.22.0.0,
     directory,
     filepath,
     process >=1.0.1.1
@@ -67,11 +67,6 @@ flag network-uri
 --  Description: Make -new-comp the default
 --  Default:     True
 
-flag custom-binary
-  Description: Use a customised version of the binary package
-  Default:     True
-  Manual:      True
-
 flag c-runtime
   Description: Include functionality from the C run-time library (which must be installed already)
   Default:     False
@@ -89,17 +84,14 @@ Library
                  exceptions
   hs-source-dirs: src/runtime/haskell
 
-  if flag(custom-binary)
-    other-modules:
-      -- not really part of GF but I have changed the original binary library
-      -- and we have to keep the copy for now.
-      Data.Binary
-      Data.Binary.Put
-      Data.Binary.Get
-      Data.Binary.Builder
-      Data.Binary.IEEE754
-  else
-    build-depends: binary, data-binary-ieee754
+  other-modules:
+    -- not really part of GF but I have changed the original binary library
+    -- and we have to keep the copy for now.
+    Data.Binary
+    Data.Binary.Put
+    Data.Binary.Get
+    Data.Binary.Builder
+    Data.Binary.IEEE754
 
 --ghc-options: -fwarn-unused-imports
 --if impl(ghc>=7.8)
-- 
cgit v1.2.3