Rename integer-gmp2's package name to `integer-gmp`wip/T9281

While the folder-name stays the same. This also bumps the version number
to 1.0.0.0 (old integer-gmp is at 0.5.1.x)

9 files changed, 20 insertions, 20 deletions

diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 4167897f85..99625ecc89 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -108,7 +108,7 @@ Library
         cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
 
     if flag(integer-gmp2)
-        build-depends: integer-gmp2
+        build-depends: integer-gmp >= 1.0 && < 1.1
         cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
 
     exposed-modules:
diff --git a/libraries/integer-gmp2/.gitignore b/libraries/integer-gmp2/.gitignore
index adbfc56001..98b7b18898 100644
--- a/libraries/integer-gmp2/.gitignore
+++ b/libraries/integer-gmp2/.gitignore
@@ -6,8 +6,8 @@
 /dist-install/
 /ghc.mk
 /gmp/config.mk
-/include/HsIntegerGmp2.h
-/integer-gmp2.buildinfo
+/include/HsIntegerGmp.h
+/integer-gmp.buildinfo
 
 /gmp/gmp.h
 /gmp/gmpbuild
diff --git a/libraries/integer-gmp2/configure.ac b/libraries/integer-gmp2/configure.ac
index 5393e0dce1..0794d9630c 100644
--- a/libraries/integer-gmp2/configure.ac
+++ b/libraries/integer-gmp2/configure.ac
@@ -77,7 +77,7 @@ AC_SUBST(HaveLibGmp)
 AC_SUBST(HaveFrameworkGMP)
 AC_SUBST(HaveSecurePowm)
 
-AC_CONFIG_FILES([integer-gmp2.buildinfo gmp/config.mk include/HsIntegerGmp2.h])
+AC_CONFIG_FILES([integer-gmp.buildinfo gmp/config.mk include/HsIntegerGmp.h])
 
 dnl--------------------------------------------------------------------
 dnl * Generate the header cbits/GmpDerivedConstants.h
diff --git a/libraries/integer-gmp2/include/HsIntegerGmp.h.in b/libraries/integer-gmp2/include/HsIntegerGmp.h.in
new file mode 100644
index 0000000000..11c64677e8
--- /dev/null
+++ b/libraries/integer-gmp2/include/HsIntegerGmp.h.in
@@ -0,0 +1,6 @@
+#ifndef _HS_INTEGER_GMP_H_
+#define _HS_INTEGER_GMP_H_
+
+#define HAVE_SECURE_POWM @HaveSecurePowm@
+
+#endif /* _HS_INTEGER_GMP_H_ */
diff --git a/libraries/integer-gmp2/include/HsIntegerGmp2.h.in b/libraries/integer-gmp2/include/HsIntegerGmp2.h.in
deleted file mode 100644
index d8573e14ab..0000000000
--- a/libraries/integer-gmp2/include/HsIntegerGmp2.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _HS_INTEGER_GMP2_H_
-#define _HS_INTEGER_GMP2_H_
-
-#define HAVE_SECURE_POWM @HaveSecurePowm@
-
-#endif /* _HS_INTEGER_GMP2_H_ */
diff --git a/libraries/integer-gmp2/integer-gmp2.buildinfo.in b/libraries/integer-gmp2/integer-gmp.buildinfo.in
index 8f7769d0c9..91b4313226 100644
--- a/libraries/integer-gmp2/integer-gmp2.buildinfo.in
+++ b/libraries/integer-gmp2/integer-gmp.buildinfo.in
@@ -2,4 +2,4 @@ include-dirs: @GMP_INCLUDE_DIRS@
 extra-lib-dirs: @GMP_LIB_DIRS@
 extra-libraries: @GMP_LIBS@
 frameworks: @GMP_FRAMEWORK@
-install-includes: HsIntegerGmp2.h
+install-includes: HsIntegerGmp.h
diff --git a/libraries/integer-gmp2/integer-gmp2.cabal b/libraries/integer-gmp2/integer-gmp.cabal
index 950cbff3b7..3e87f03a93 100644
--- a/libraries/integer-gmp2/integer-gmp2.cabal
+++ b/libraries/integer-gmp2/integer-gmp.cabal
@@ -1,5 +1,5 @@
-name:                integer-gmp2
-version:             0.0.1.0
+name:                integer-gmp
+version:             1.0.0.0
 synopsis:            Integer library based on GMP
 license:             BSD3
 license-file:        LICENSE
@@ -17,16 +17,16 @@ extra-source-files:
     configure
     configure.ac
     gmp/config.mk.in
-    include/HsIntegerGmp2.h.in
-    integer-gmp2.buildinfo.in
+    include/HsIntegerGmp.h.in
+    integer-gmp.buildinfo.in
 
 extra-tmp-files:
     autom4te.cache
     config.log
     config.status
     gmp/config.mk
-    integer-gmp2.buildinfo
-    include/HsIntegerGmp2.h
+    integer-gmp.buildinfo
+    include/HsIntegerGmp.h
 
 library
   default-language:    Haskell2010
@@ -46,7 +46,7 @@ library
     UnliftedFFITypes
   build-depends:       ghc-prim
   hs-source-dirs:      src/
-  ghc-options: -this-package-key integer-gmp2 -Wall
+  ghc-options: -this-package-key integer-gmp -Wall
   cc-options: -std=c99 -Wall
 
   include-dirs: include
diff --git a/libraries/integer-gmp2/src/GHC/Integer.hs b/libraries/integer-gmp2/src/GHC/Integer.hs
index c9675f5623..ffd708bb93 100644
--- a/libraries/integer-gmp2/src/GHC/Integer.hs
+++ b/libraries/integer-gmp2/src/GHC/Integer.hs
@@ -16,7 +16,7 @@
 -- The 'Integer' type.
 --
 -- This module exposes the /portable/ 'Integer' API.  See
--- "GHC.Integer.GMP.Internals" for the @integer-gmp2@-specific internal
+-- "GHC.Integer.GMP.Internals" for the @integer-gmp@-specific internal
 -- representation of 'Integer' as well as optimized GMP-specific
 -- operations.
 
diff --git a/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
index e4169e788e..d119adb9f8 100644
--- a/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
+++ b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
@@ -23,7 +23,7 @@
 -- This modules provides access to the 'Integer' constructors and
 -- exposes some highly optimized GMP-operations.
 --
--- Note that since @integer-gmp2@ does not depend on `base`, error
+-- Note that since @integer-gmp@ does not depend on `base`, error
 -- reporting via exceptions, 'error', or 'undefined' is not
 -- available. Instead, the low-level functions will crash the runtime
 -- if called with invalid arguments.