packaging: Give ghc-pkg the same version as ProjectVersion

.gitignore

@@ -199,6 +199,7 @@ _darcs/
 /utils/mkUserGuidePart/mkUserGuidePart.cabal
 /utils/runghc/runghc.cabal
 /utils/gen-dll/gen-dll.cabal
+/utils/ghc-pkg/ghc-pkg.cabal
 utils/lndir/fs.*
 utils/unlit/fs.*
 rts/fs.*

configure.ac

@@ -1430,6 +1430,7 @@ AC_CONFIG_FILES(
   driver/ghci/ghci-wrapper.cabal
   utils/iserv/iserv.cabal
   utils/iserv-proxy/iserv-proxy.cabal
+  utils/ghc-pkg/ghc-pkg.cabal
   utils/remote-iserv/remote-iserv.cabal
   utils/gen-dll/gen-dll.cabal
   libraries/ghc-boot/ghc-boot.cabal

hadrian/src/Rules/Configure.hs

@@ -21,6 +21,7 @@ configureResults =
     , "utils/iserv/iserv.cabal"
     , "utils/iserv-proxy/iserv-proxy.cabal"
     , "utils/remote-iserv/remote-iserv.cabal"
+    , "utils/ghc-pkg/ghc-pkg.cabal"
     , "utils/runghc/runghc.cabal"
     , "utils/gen-dll/gen-dll.cabal"
     , "libraries/ghc-boot/ghc-boot.cabal"

utils/ghc-pkg/ghc-pkg.cabal → utils/ghc-pkg/ghc-pkg.cabal.in

 Name: ghc-pkg
 -- XXX Version number
-Version: 6.9
+Version: @ProjectVersion@
 Copyright: XXX
 License: BSD3
 -- XXX License-File: LICENSE