tag 516425 + patch
thanks

The attached patch incorporates Ruben's change, which has already been
included upstream, as well as another change to Main.lhs also already
included upstream and some changes to get_version.hs.  All of these
changes are required to allow happy to build successfully.

-- 
Matt                                                 http://ftbfs.org/
diff -ru happy-1.17~/debian/get_version.hs happy-1.17/debian/get_version.hs
--- happy-1.17~/debian/get_version.hs   2009-02-24 21:08:57.000000000 -0800
+++ happy-1.17/debian/get_version.hs    2009-02-24 21:46:07.000000000 -0800
@@ -1,14 +1,16 @@
 
 module Main (main) where
 
+import Data.Version ( showVersion )
 import Distribution.Package
 import Distribution.PackageDescription
+import Distribution.PackageDescription.Parse ( readPackageDescription )
 import Distribution.Simple.Utils
 import Distribution.Verbosity
 import Distribution.Version
 
 main :: IO ()
-main = do fp <- findPackageDesc normal "."
+main = do fp <- findPackageDesc "."
           pd <- readPackageDescription normal fp
           putStr $ showVersion $ pkgVersion $ package $ packageDescription pd
 
diff -ru happy-1.17~/Setup.lhs happy-1.17/Setup.lhs
--- happy-1.17~/Setup.lhs       2009-02-24 21:08:57.000000000 -0800
+++ happy-1.17/Setup.lhs        2009-02-24 21:45:50.000000000 -0800
@@ -4,7 +4,7 @@
 module Main where
 
 import Distribution.PackageDescription (PackageDescription(..))
-import Distribution.Simple.Setup ( BuildFlags(..) )
+import Distribution.Simple.Setup ( BuildFlags(..), buildVerbose )
 import Distribution.Simple ( defaultMainWithHooks, defaultUserHooks, 
UserHooks(..) )
 import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) )
 import Distribution.Simple.Program
diff -ru happy-1.17~/src/Main.lhs happy-1.17/src/Main.lhs
--- happy-1.17~/src/Main.lhs    2009-02-24 21:08:57.000000000 -0800
+++ happy-1.17/src/Main.lhs     2009-02-24 21:50:51.000000000 -0800
@@ -36,7 +36,7 @@
 > import Foreign.C
 #endif
 #if defined(__GLASGOW_HASKELL__)
-> import GHC.Prim ( unsafeCoerce# )
+> import GHC.Exts ( unsafeCoerce# )
 #define sCC _scc_
 > coerceParser = unsafeCoerce#
 #else

Reply via email to