[Pkg-haskell-commits] darcs: helium: Drop 04_fixes-for-ghc6

[Joachim Breitner]

Thu Jun  2 17:15:10 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop 04_fixes-for-ghc6
  Ignore-this: e1187a55fae401984a57d88aa215d43c

    R ./patches/04_fixes-for-ghc6
    M ./patches/series -1

Thu Jun  2 17:15:10 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop 04_fixes-for-ghc6
  Ignore-this: e1187a55fae401984a57d88aa215d43c
diff -rN -u old-helium//patches/04_fixes-for-ghc6 new-helium//patches/04_fixes-for-ghc6
--- old-helium//patches/04_fixes-for-ghc6	2011-06-02 17:25:53.004298976 +0000
+++ new-helium//patches/04_fixes-for-ghc6	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-# Description: Fixes for ghc6
-# Author: Arjan Oosting <arjan at debian.org>
-Index: helium-1.6/Top/src/Top/Ordering/Tree.hs
-===================================================================
---- helium-1.6.orig/Top/src/Top/Ordering/Tree.hs	2006-02-05 14:35:54.000000000 -0200
-+++ helium-1.6/Top/src/Top/Ordering/Tree.hs	2010-03-15 10:27:16.000000000 -0300
-@@ -36,13 +36,15 @@
- infixr 8 .>. , .>>. , .<. , .<<.
- 
- (.>.), (.>>.), (.<.), (.<<.) :: [a] -> Tree a -> Tree a
--((.>.), (.>>.), (.<.), (.<<.)) = 
--   let -- prevents adding an empty list
--       f constructor direction as tree
--          | null as   = tree 
--          | otherwise = constructor direction as tree
--   in (f AddList Down, f Spread Down, f AddList Up, f Spread Up)
-+(.>.)  = addIfNotEmpty AddList Down
-+(.>>.) = addIfNotEmpty Spread Down
-+(.<.)  = addIfNotEmpty AddList Up
-+(.<<.) = addIfNotEmpty Spread Up
- 
-+addIfNotEmpty :: (forall a . Direction -> [a] -> Tree a -> Tree a) -> Direction -> [b] -> Tree b -> Tree b
-+addIfNotEmpty constructor direction as tree
-+          | null as   = tree
-+          | otherwise = constructor direction as tree
- 
- ------------------------------------------------------------------------
- 
-Index: helium-1.6/Top/src/makefile
-===================================================================
---- helium-1.6.orig/Top/src/makefile	2006-02-05 14:35:55.000000000 -0200
-+++ helium-1.6/Top/src/makefile	2010-03-15 10:27:16.000000000 -0300
-@@ -51,7 +51,7 @@
- 
- topsolver-prof:
- 	# build the Top constraint solver with profiling
--	$(HC) $(HC_OPTS) --make -package text -prof -auto-all -o $(BIN_DIR)/topsolver TopSolver.hs
-+	$(HC) $(HC_OPTS) --make -prof -auto-all -o $(BIN_DIR)/topsolver TopSolver.hs
- 
- #-----------------------------------------------------------------------
- # Cobalt
-Index: helium-1.6/helium/src/Makefile.in
-===================================================================
---- helium-1.6.orig/helium/src/Makefile.in	2010-03-15 10:27:14.000000000 -0300
-+++ helium-1.6/helium/src/Makefile.in	2010-03-15 10:27:16.000000000 -0300
-@@ -48,7 +48,7 @@
- PACKAGENET = 
- endif
- HC_OPTS = -static -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances \
--		$(PACKAGENET) -package lang -package text -package editline -i$(IFACES) $(EXTRA_HC_OPTS)
-+		$(PACKAGENET) -package containers -package mtl -package parsec -package editline -i$(IFACES) $(EXTRA_HC_OPTS)
- 
- AG      = @WithAG@
- AG_OPTS = -mscfr
-Index: helium-1.6/lvm/src/lib/makefile
-===================================================================
---- helium-1.6.orig/lvm/src/lib/makefile	2006-02-05 14:35:50.000000000 -0200
-+++ helium-1.6/lvm/src/lib/makefile	2010-03-15 10:27:16.000000000 -0300
-@@ -20,7 +20,7 @@
- 
- #the haskell compiler
- HC	= ghc
--HC_OPTS = -cpp -static -package lang -package text -i$(IFACES) $(EXTRA_HC_OPTS)
-+HC_OPTS = -cpp -static -package parsec -i$(IFACES) $(EXTRA_HC_OPTS)
- 
- #Haskell sources
- COMMON	= common/Id.hs common/IdMap.hs common/IdSet.hs \
diff -rN -u old-helium//patches/series new-helium//patches/series
--- old-helium//patches/series	2011-06-02 17:25:53.004298976 +0000
+++ new-helium//patches/series	2011-06-02 17:25:53.080772761 +0000
@@ -1,7 +1,6 @@
 01_fhs-and-destdir
 02_typed-punning
 03_add-readline-support
-04_fixes-for-ghc6
 05_fixes-for-64bit
 06_no-strip
 10_autoconf