[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-13.dsc

[Kari Pahula]

Wed Feb 25 03:53:48 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-13.dsc

    M ./changelog +16
    M ./control -2 +2
    M ./ghc6-doc.triggers +1
    A ./patches/ghc_binary_int32
    M ./patches/series -1 +1
    M ./rules -1

Wed Feb 25 03:53:48 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-13.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:20.601021593 +0000
+++ new-ghc/changelog	2011-01-15 06:06:20.853034869 +0000
@@ -1,3 +1,19 @@
+ghc6 (6.10.1+dfsg1-13) unstable; urgency=low
+
+  * Haddock again just a B-D-I, now with (>= 2.4.1-4).
+  * Patched compiler/utils/Binary.hs to store Ints as Int32s on 64 bit
+    arches, too.
+  * Put .haddock files back to ghc6-doc.
+
+ -- Kari Pahula <kaol at debian.org>  Wed, 25 Feb 2009 05:53:48 +0200
+
+ghc6 (6.10.1+dfsg1-12) unstable; urgency=low
+
+  * Put haddock in Build-Depends on [i386 amd64 sparc powerpc mips mipsel
+    s390 kfreebsd-i386].
+
+ -- Kari Pahula <kaol at debian.org>  Sat, 21 Feb 2009 14:08:08 +0200
+
 ghc6 (6.10.1+dfsg1-11) unstable; urgency=low
 
   * Put .haddock files in ghc6, not ghc6-doc.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:20.601021593 +0000
+++ new-ghc/control	2011-01-15 06:06:20.853034869 +0000
@@ -4,7 +4,7 @@
 Maintainer: Kari Pahula <kaol at debian.org>
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 4), libgmp3-dev, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml
-Build-Depends-Indep: haddock (>= 2.4.1-2)
+Build-Depends-Indep: haddock (>= 2.4.1-4)
 Homepage: http://haskell.org/
 
 Package: ghc6
@@ -47,7 +47,7 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Depends: haddock (>= 2.4.1-2) [i386 amd64], ${misc:Depends}
+Depends: haddock (>= 2.4.1-4), ${misc:Depends}
 Description: Documentation for the Glasgow Haskell Compilation system
  Version 6 of the Glorious Glasgow Haskell Compilation system (GHC).  GHC is
  a compiler for Haskell98.
diff -rN -u old-ghc/ghc6-doc.triggers new-ghc/ghc6-doc.triggers
--- old-ghc/ghc6-doc.triggers	2011-01-15 06:06:20.601021593 +0000
+++ new-ghc/ghc6-doc.triggers	2011-01-15 06:06:20.849034658 +0000
@@ -1,5 +1,6 @@
 interest /usr/share/doc/ghc6-doc/libraries
 interest /usr/share/ghc6-doc/haddock
+interest /usr/share/ghc6-doc/ghc-6.10.1/haddock
 interest /usr/lib/ghc6-doc/haddock
 interest /usr/lib/ghc-6.10.1/haddock
 interest /usr/lib/ghc6-6.10.1/haddock
diff -rN -u old-ghc/patches/ghc_binary_int32 new-ghc/patches/ghc_binary_int32
--- old-ghc/patches/ghc_binary_int32	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/ghc_binary_int32	2011-01-15 06:06:20.845034447 +0000
@@ -0,0 +1,20 @@
+Index: ghc6-6.10.1+dfsg1/compiler/utils/Binary.hs
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/utils/Binary.hs	2009-02-25 05:49:14.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/utils/Binary.hs	2009-02-25 07:25:39.000000000 +0200
+@@ -404,10 +404,13 @@
+         x <- get bh
+         return $! (fromIntegral (x :: Int32))
+ #elif SIZEOF_HSINT == 8
+-    put_ bh i = put_ bh (fromIntegral i :: Int64)
++    put_ bh i = if (i < (fromIntegral (minBound::Int32))
++                          || i > (fromIntegral (maxBound::Int32)))
++                then error "Binary.instance Binary Int: Int out of bounds for Int32"
++                else put_ bh (fromIntegral i :: Int32)
+     get  bh = do
+         x <- get bh
+-        return $! (fromIntegral (x :: Int64))
++        return $! (fromIntegral (x :: Int32))
+ #else
+ #error "unsupported sizeof(HsInt)"
+ #endif
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 06:06:20.597021382 +0000
+++ new-ghc/patches/series	2011-01-15 06:06:20.845034447 +0000
@@ -3,4 +3,4 @@
 tuple3-trac2750
 use-system-haddock
 ld-relax-ia64-fix
-haddock-usr-lib
+ghc_binary_int32
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:20.597021382 +0000
+++ new-ghc/rules	2011-01-15 06:06:20.841034237 +0000
@@ -177,7 +177,6 @@
 	find debian/tmp/usr/lib $(FILES) $(PROF_FILE) > debian/ghc6-prof.install
 	echo debian/tmp/usr/share/lintian/overrides/ghc6-prof >> debian/ghc6-prof.install
 	# ghc6-doc
-	find debian/tmp/usr/share/doc    $(FILES) -name '*.haddock' -exec rm '{}' ';'
 	find debian/tmp/usr/share/doc    $(FILES)  > debian/ghc6-doc.install
 	find debian/tmp/usr/lib/ghc6-doc $(FILES) >> debian/ghc6-doc.install