Remove PGF from PGF2, clean up PGF2 cabal file.

3 files changed, 41 insertions, 35 deletions

diff --git a/src/runtime/haskell-bind/PGF.hs b/src/runtime/haskell-bind/PGF.hs
deleted file mode 100644
index 8aeca7ab8..000000000
--- a/src/runtime/haskell-bind/PGF.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module PGF(module PGF2) where
-
-import PGF2
diff --git a/src/runtime/haskell-bind/PGF/Internal.hs b/src/runtime/haskell-bind/PGF/Internal.hs
deleted file mode 100644
index e8193b788..000000000
--- a/src/runtime/haskell-bind/PGF/Internal.hs
+++ /dev/null
@@ -1 +0,0 @@
-module PGF.Internal where
diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal
index 4022f0b9b..166369369 100644
--- a/src/runtime/haskell-bind/pgf2.cabal
+++ b/src/runtime/haskell-bind/pgf2.cabal
@@ -1,37 +1,47 @@
-name:                pgf2
-version:             0.1.0.0
--- synopsis:
--- description:
-homepage:            http://www.grammaticalframework.org
-license:             LGPL-3
---license-file:        LICENSE
-author:              Krasimir Angelov, Inari
-maintainer:
--- copyright:
-category:            Language
-build-type:          Simple
-extra-source-files:  README
-cabal-version:       >=1.10
+name: pgf2
+version: 1.0.0
+synopsis: Bindings to the Grammatical Framework C runtime
+description:
+  GF, Grammatical Framework, is a programming language for multilingual grammar applications.
+  GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C.
+  This package provides Haskell bindings to that runtime.
+homepage: https://www.grammaticalframework.org
+license: LGPL-3
+author: Krasimir Angelov, Inari Listenmaa
+category: Language
+build-type: Simple
+extra-source-files: README
+cabal-version: >=1.10
 
 library
-  exposed-modules:     PGF2, PGF2.Internal, SG
-                       -- backwards compatibility API:
-                       --, PGF, PGF.Internal
-  other-modules:       PGF2.FFI, PGF2.Expr, PGF2.Type, SG.FFI
-  build-depends:       base >=4.3,
-                       containers, pretty
-  -- hs-source-dirs:
-  default-language:    Haskell2010
-  build-tools:         hsc2hs
-
-  extra-libraries:     sg pgf gu
-  cc-options:          -std=c99
-  c-sources:           utils.c
+  exposed-modules:
+    PGF2,
+    PGF2.Internal,
+    SG
+  other-modules:
+    PGF2.FFI,
+    PGF2.Expr,
+    PGF2.Type,
+    SG.FFI
+  build-depends:
+    base >=4.3,
+    containers,
+    pretty
+  default-language: Haskell2010
+  build-tools: hsc2hs
+  extra-libraries: sg pgf gu
+  cc-options: -std=c99
+  c-sources: utils.c
 
 executable pgf-shell
-  main-is:             pgf-shell.hs
-  hs-source-dirs:      examples
-  build-depends:       base, pgf2, containers, mtl, lifted-base
-  default-language:    Haskell2010
+  main-is: pgf-shell.hs
+  hs-source-dirs: examples
+  build-depends:
+    base,
+    containers,
+    lifted-base,
+    mtl,
+    pgf2
+  default-language: Haskell2010
   if impl(ghc>=7.0)
     ghc-options: -rtsopts