Dear maintainer,

I've prepared an NMU for happy (versioned as 1.17-0.2). The diff
is attached to this message.

Regards.

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aure...@debian.org         | aurel...@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net
diff -u happy-1.17/debian/changelog happy-1.17/debian/changelog
--- happy-1.17/debian/changelog
+++ happy-1.17/debian/changelog
@@ -1,3 +1,11 @@
+happy (1.17-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Ruben Molina and Matt Kraai to fix FTBFS with a 
+    recent GHC6. (Closes: #516425).
+
+ -- Aurelien Jarno <aure...@debian.org>  Mon, 17 Aug 2009 18:26:15 +0200
+
 happy (1.17-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u happy-1.17/debian/get_version.hs happy-1.17/debian/get_version.hs
--- happy-1.17/debian/get_version.hs
+++ happy-1.17/debian/get_version.hs
@@ -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
 
only in patch2:
unchanged:
--- happy-1.17.orig/Setup.lhs
+++ happy-1.17/Setup.lhs
@@ -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
only in patch2:
unchanged:
--- happy-1.17.orig/src/Main.lhs
+++ happy-1.17/src/Main.lhs
@@ -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