On Wed, 25 Oct 2006, Arjan Oosting wrote:
> I just looked at the build log of my patch and I seeing some failures in
> the tests run at build time:
> perl ./runtest.pl all
> Running test003...FAILURE
> Running test011...FAILURE
> Running test015...FAILURE
Looks like darcs pulls in some unrelated changes (except that they were
earlier changes to the same files) from after the 0.2.0 release, including
part but not all of the changes to the marshal() format. The test case
failures probably aren't important if that's the case, but it's probably
safer to do a smaller patch - there are definitely some unrelated changes
to the compiler being pulled in.
I've attached a patch against 0.2.0-2 that has only the essential changes
(and the man page compression fix) and doesn't give testcase problems. It
also changes the ghc build-depends to >= 6.6, since it doesn't bring all
the autoconf version detection across.
--
Chris
diff -ur kaya-0.2.0-2/compiler/AbsSyntax.hs
kaya-0.2.0-patched/compiler/AbsSyntax.hs
--- kaya-0.2.0-2/compiler/AbsSyntax.hs 2006-10-25 12:34:34.000000000 +0100
+++ kaya-0.2.0-patched/compiler/AbsSyntax.hs 2006-10-25 15:02:06.000000000
+0100
@@ -39,7 +39,7 @@
quotename ('_':cs) = "_UN_"++quotename cs
quotename ('\'':cs) = "_PR_"++quotename cs
quotename ('?':cs) = "_QU_"++quotename cs
-quotename ('£':cs) = "_PO_"++quotename cs
+-- quotename ('£':cs) = "_PO_"++quotename cs
quotename ('$':cs) = "_DO_"++quotename cs
quotename ('#':cs) = "_HA_"++quotename cs
quotename ('@':cs) = "_AT_"++quotename cs
@@ -329,14 +329,14 @@
-- *BOGGLE* Why do I have to do this?
-- Come to think of it, why am I even using a tuple?
-instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show (a,b,c,d,e,f)
+{- instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show
(a,b,c,d,e,f)
where show (a,b,c,d,e,f) = "(" ++ show a ++ "," ++
show b ++ "," ++
show c ++ "," ++
show d ++ "," ++
show e ++ "," ++
show f ++ ")"
-
+-}
data Decl = FunBind (String, Int, Name, Type, [FOpt], Binder (Expr Name))
String Type
| Glob (Name, Type, Int)
diff -ur kaya-0.2.0-2/compiler/Makefile.in
kaya-0.2.0-patched/compiler/Makefile.in
--- kaya-0.2.0-2/compiler/Makefile.in 2006-10-25 12:34:34.000000000 +0100
+++ kaya-0.2.0-patched/compiler/Makefile.in 2006-10-25 15:02:20.000000000
+0100
@@ -2,7 +2,7 @@
GHCI = @GHCI@
HAPPY = @HAPPY@
LANGNAME = @LANGNAME@
-PACKAGES = -package util -package lang
+PACKAGES =
OPTS = -fglasgow-exts ${PACKAGES}
prefix = @prefix@
diff -ur kaya-0.2.0-2/debian/control kaya-0.2.0-patched/debian/control
--- kaya-0.2.0-2/debian/control 2006-10-25 12:34:35.000000000 +0100
+++ kaya-0.2.0-patched/debian/control 2006-10-25 15:01:28.000000000 +0100
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Stuart Teasdale <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ghc6 | ghc, libgc-dev,
happy, libpcre3-dev, libncurses5-dev, libgcrypt-dev, libgnutls-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, ghc6 (>= 6.6), libgc-dev,
happy, libpcre3-dev, libncurses5-dev, libgcrypt-dev, libgnutls-dev,
libghc6-mtl-dev
Standards-Version: 3.7.2
Package: kaya
diff -ur kaya-0.2.0-2/man/Makefile.in kaya-0.2.0-patched/man/Makefile.in
--- kaya-0.2.0-2/man/Makefile.in 2006-10-25 12:34:34.000000000 +0100
+++ kaya-0.2.0-patched/man/Makefile.in 2006-10-25 15:30:48.000000000 +0100
@@ -16,4 +16,4 @@
install ${INSTALLFLAGS} ${MANDEST} ${mandir}/man1
%.gz: %
- gzip -c $< > $@
+ gzip -9 -c $< > $@
