[Pkg-haskell-commits] darcs: haskell98-report: GHC 7.4 compatibility (Closes: #665065)

Joachim Breitner mail at joachim-breitner.de
Sat Mar 24 21:22:38 UTC 2012 

Sat Mar 24 21:22:00 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * GHC 7.4 compatibility (Closes: #665065)
  Ignore-this: 92de7182224dde41271b31bbeb284565

    M ./changelog +6
    M ./patches/correct-build.patch -32 +63

Sat Mar 24 21:22:00 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * GHC 7.4 compatibility (Closes: #665065)
  Ignore-this: 92de7182224dde41271b31bbeb284565
diff -rN -u old-haskell98-report//changelog new-haskell98-report//changelog
--- old-haskell98-report//changelog	2012-03-24 21:22:38.078799774 +0000
+++ new-haskell98-report//changelog	2012-03-24 21:22:38.078799774 +0000
@@ -1,3 +1,9 @@
+haskell98-report (20080907-3) UNRELEASED; urgency=low
+
+  * GHC 7.4 compatibility (Closes: #665065)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 24 Mar 2012 22:07:27 +0100
+
 haskell98-report (20080907-2) unstable; urgency=low
 
   [ Marco Silva ]
diff -rN -u old-haskell98-report//patches/correct-build.patch new-haskell98-report//patches/correct-build.patch
--- old-haskell98-report//patches/correct-build.patch	2012-03-24 21:22:38.058337141 +0000
+++ new-haskell98-report//patches/correct-build.patch	2012-03-24 21:22:38.083270048 +0000
@@ -1,6 +1,7 @@
-diff -rN -u old-haskell98-report/ffi/Makefile new-haskell98-report/ffi/Makefile
---- old-haskell98-report/ffi/Makefile	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/ffi/Makefile	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/ffi/Makefile
+===================================================================
+--- haskell98-report-20080907.orig/ffi/Makefile	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/ffi/Makefile	2012-03-24 22:20:49.000000000 +0100
 @@ -1,9 +1,18 @@
 +
 +all: ffi.ps ffi.pdf
@@ -26,9 +27,10 @@
  clean:
 -	-rm -f *.aux *.log *.blg *.dvi *.bbl *.toc *.ps *.html *.css *.png *.4ct *.4tc *.idv *.xref tex4ht.fls
 +	-rm -f *.aux *.log *.blg *.dvi *.bbl *.toc *.ps *.html *.css *.png *.4ct *.4tc *.idv *.xref tex4ht.fls *.pdf
-diff -rN -u old-haskell98-report/hierarchical-modules/Makefile new-haskell98-report/hierarchical-modules/Makefile
---- old-haskell98-report/hierarchical-modules/Makefile	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/hierarchical-modules/Makefile	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/hierarchical-modules/Makefile
+===================================================================
+--- haskell98-report-20080907.orig/hierarchical-modules/Makefile	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/hierarchical-modules/Makefile	2012-03-24 22:20:49.000000000 +0100
 @@ -7,5 +7,6 @@
  hier.pdf: hier.tex
  	TEXINPUTS=../styles: pdflatex $<
@@ -38,9 +40,10 @@
 +.PHONY: clean
 +clean:
 +	-rm -f *.aux *.log *.blg *.dvi *.bbl *.toc *.ps *.html *.css *.png *.4ct *.4tc *.idv *.xref tex4ht.fls *.pdf
-diff -rN -u old-haskell98-report/Makefile new-haskell98-report/Makefile
---- old-haskell98-report/Makefile	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/Makefile	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/Makefile
+===================================================================
+--- haskell98-report-20080907.orig/Makefile	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/Makefile	2012-03-24 22:20:49.000000000 +0100
 @@ -1,14 +1,21 @@
 -RELEASE_DIR = haskell98-revised
 +PREFIX = haskell98-revised
@@ -69,9 +72,10 @@
  
  jfp:
  	-mkdir $(JFP_DIR)
-diff -rN -u old-haskell98-report/report/classes.eps new-haskell98-report/report/classes.eps
---- old-haskell98-report/report/classes.eps	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/report/classes.eps	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/report/classes.eps
+===================================================================
+--- haskell98-report-20080907.orig/report/classes.eps	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/report/classes.eps	2012-03-24 22:20:49.000000000 +0100
 @@ -826,7 +826,8 @@
  %%Trailer
  %%DocumentNeededResources: 
@@ -82,9 +86,10 @@
  %%DocumentSuppliedResources: 
  %%+ procset Pscript_WinNT_ErrorHandler 5.0 0
  %%+ procset Pscript_FatalError 5.0 0
-diff -rN -u old-haskell98-report/report/h98-revised.html new-haskell98-report/report/h98-revised.html
---- old-haskell98-report/report/h98-revised.html	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/report/h98-revised.html	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/report/h98-revised.html
+===================================================================
+--- haskell98-report-20080907.orig/report/h98-revised.html	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/report/h98-revised.html	2012-03-24 22:20:49.000000000 +0100
 @@ -28,13 +28,11 @@
  <p><li> The Haskell 98 Report (revised) 
  <ul>
@@ -101,9 +106,10 @@
  
  <p><li>
  <a href="haskell98-bugs.html">A complete list of all changes</a> made to both reports between the Jan 1999 publication
-diff -rN -u old-haskell98-report/report/haskell.idx new-haskell98-report/report/haskell.idx
---- old-haskell98-report/report/haskell.idx	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/report/haskell.idx	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/report/haskell.idx
+===================================================================
+--- haskell98-report-20080907.orig/report/haskell.idx	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/report/haskell.idx	2012-03-24 22:20:49.000000000 +0100
 @@ -1388,7 +1388,7 @@
  \indexentry{Show@{\tt  Show} (class)!instance for {\tt Array}}{178}
  \indexentry{Read@{\tt  Read} (class)!instance for {\tt Array}}{178}
@@ -140,9 +146,10 @@
  \indexentry{deleteFirstsBy@{\tt  deleteFirstsBy}}{187}
  \indexentry{union@{\tt  union}}{187}
  \indexentry{unionBy@{\tt  unionBy}}{187}
-diff -rN -u old-haskell98-report/report/Makefile new-haskell98-report/report/Makefile
---- old-haskell98-report/report/Makefile	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/report/Makefile	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/report/Makefile
+===================================================================
+--- haskell98-report-20080907.orig/report/Makefile	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/report/Makefile	2012-03-24 22:20:49.000000000 +0100
 @@ -40,7 +40,11 @@
  #	Files 
  #########################################
@@ -222,9 +229,10 @@
  
  
  # -----------------------------------------------------------
-diff -rN -u old-haskell98-report/tools/Makefile new-haskell98-report/tools/Makefile
---- old-haskell98-report/tools/Makefile	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/tools/Makefile	2010-03-08 13:18:19.000000000 -0300
+Index: haskell98-report-20080907/tools/Makefile
+===================================================================
+--- haskell98-report-20080907.orig/tools/Makefile	2012-03-24 22:20:46.000000000 +0100
++++ haskell98-report-20080907/tools/Makefile	2012-03-24 22:20:52.000000000 +0100
 @@ -14,13 +14,16 @@
  
  all : verbatim run_tex run_index
@@ -239,19 +247,42 @@
  
  run_tex: tex.hs
 -	$(GHC) -o run_tex tex.hs -fglasgow-exts -H20m -package lang
-+	$(GHC) -o run_tex tex.hs -fglasgow-exts -H20m
++	$(GHC) -o run_tex tex.hs -fglasgow-exts -H20m 
  
  run_index: index.hs
  	$(GHC) -o run_index index.hs -fglasgow-exts -H20m
-diff -rN -u old-haskell98-report/tools/tex.hs new-haskell98-report/tools/tex.hs
---- old-haskell98-report/tools/tex.hs	2010-03-08 13:18:19.000000000 -0300
-+++ new-haskell98-report/tools/tex.hs	2010-03-08 13:18:19.000000000 -0300
-@@ -82,7 +82,7 @@
- import IO hiding (bracket)
- import Char(isSpace, isAlpha, isDigit)
+Index: haskell98-report-20080907/tools/index.hs
+===================================================================
+--- haskell98-report-20080907.orig/tools/index.hs	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/tools/index.hs	2012-03-24 22:20:49.000000000 +0100
+@@ -6,8 +6,8 @@
+ 
+ module Main where
+ 
+-import IO
+-import Char
++import System.IO
++import Data.Char
+ 
+ main = do refs <- readRefFile "reportrefs"
+           doFiles refs ["prelude-index"]
+Index: haskell98-report-20080907/tools/tex.hs
+===================================================================
+--- haskell98-report-20080907.orig/tools/tex.hs	2012-03-24 22:20:25.000000000 +0100
++++ haskell98-report-20080907/tools/tex.hs	2012-03-24 22:20:49.000000000 +0100
+@@ -78,11 +78,11 @@
+ 
+ module Main where
+ 
+-import Monad(foldM)
+-import IO hiding (bracket)
+-import Char(isSpace, isAlpha, isDigit)
++import Control.Monad(foldM)
++import System.IO
++import Data.Char(isSpace, isAlpha, isDigit)
  
 -import IOExts(unsafePerformIO)  -- debugging only
-+-- import IOExts(unsafePerformIO)  -- debugging only
++import System.IO.Unsafe(unsafePerformIO)  -- debugging only
  
  data FontStyle = RM | IT | TT | Bold | Sym | UL
      deriving (Eq,Show)

More information about the Pkg-haskell-commits mailing list