[Pkg-haskell-commits] darcs: ghc: Remove files in patches not in patches/series.

[Marco Silva]

Sat Jan 15 13:24:08 UTC 2011  Marco Silva <marcot at debian.org>
  * Remove files in patches not in patches/series.
  Ignore-this: 114cf4e3b3878849c47f24d1bc69b06f

    R ./patches/RnSource-hlist-trac-3850
    R ./patches/system-haddock

Sat Jan 15 13:24:08 UTC 2011  Marco Silva <marcot at debian.org>
  * Remove files in patches not in patches/series.
  Ignore-this: 114cf4e3b3878849c47f24d1bc69b06f
diff -rN -u old-ghc/patches/RnSource-hlist-trac-3850 new-ghc/patches/RnSource-hlist-trac-3850
--- old-ghc/patches/RnSource-hlist-trac-3850	2011-01-15 13:26:02.410852535 +0000
+++ new-ghc/patches/RnSource-hlist-trac-3850	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Index: ghc6-6.12.1/compiler/rename/RnSource.lhs
-===================================================================
---- ghc6-6.12.1.orig/compiler/rename/RnSource.lhs	2010-04-07 06:24:49.000000000 +0300
-+++ ghc6-6.12.1/compiler/rename/RnSource.lhs	2010-04-07 06:39:11.000000000 +0300
-@@ -690,9 +690,9 @@
- 		   else emptyFVs))
-         }
-   where
--    h98_style = case condecls of
--		     L _ (ConDecl { con_res = ResTyH98 }) : _  -> True
--		     _    		                       -> False
-+    h98_style = case condecls of        -- Note [Stupid theta]
-+		     L _ (ConDecl { con_res = ResTyGADT {} }) : _  -> False
-+                     _						   -> True
-     data_doc = text "In the data type declaration for" <+> quotes (ppr tycon)
- 
-     rn_derivs Nothing   = return (Nothing, emptyFVs)
diff -rN -u old-ghc/patches/system-haddock new-ghc/patches/system-haddock
--- old-ghc/patches/system-haddock	2011-01-15 13:26:02.406852324 +0000
+++ new-ghc/patches/system-haddock	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Index: ghc6-6.12.1/ghc.mk
-===================================================================
---- ghc6-6.12.1.orig/ghc.mk	2010-01-11 16:00:43.000000000 +0200
-+++ ghc6-6.12.1/ghc.mk	2010-01-11 16:00:53.000000000 +0200
-@@ -519,9 +519,8 @@
- endif
- 
- ifneq "$(HADDOCK_DOCS)" "NO"
--BUILD_DIRS += \
--   utils/haddock \
--   utils/haddock/doc
-+inplace/bin/haddock: inplace/bin/ghc-stage2
-+	touch inplace/bin/haddock
- endif
- 
- ifneq "$(CLEANING)" "YES"
-Index: ghc6-6.12.1/rules/haddock.mk
-===================================================================
---- ghc6-6.12.1.orig/rules/haddock.mk	2010-01-11 16:00:00.000000000 +0200
-+++ ghc6-6.12.1/rules/haddock.mk	2010-01-12 01:37:12.000000000 +0200
-@@ -40,7 +40,7 @@
- ifneq "$$(BINDIST)" "YES"
- $$($$($1_PACKAGE)_HADDOCK_FILE) : $$(MKDIRHIER) $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS)
- 	"$$(MKDIRHIER)" $$(dir $$@)
--	"$$(GHC_CABAL_INPLACE)" haddock $2 $1 --with-haddock=$$(TOP)/$$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS)
-+	"$$(GHC_CABAL_INPLACE)" haddock $2 $1 --with-haddock=/usr/bin/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS)
- 
- # Make the haddocking depend on the library .a file, to ensure
- # that we wait until the library is fully build before we haddock it