update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / .darcs-boring

diff --git a/.darcs-boring b/.darcs-boring
index fdbae8f..a1a6445 100644 (file)
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -33,7 +33,6 @@
 ^libraries/HUnit(/|$)
 ^libraries/HaXml(/|$)
 ^libraries/Japi(/|$)
-^libraries/ObjectIO(/|$)
 ^libraries/OpenAL(/|$)
 ^libraries/OpenGL(/|$)
 ^libraries/QuickCheck(/|$)
@@ -42,6 +41,8 @@
 ^libraries/array(/|$)
 ^libraries/arrows(/|$)
 ^libraries/base(/|$)
+^libraries/base3-compat(/|$)
+^libraries/binary(/|$)
 ^libraries/bytestring(/|$)
 ^libraries/cgi(/|$)
 ^libraries/concurrent(/|$)
@@ -50,6 +51,7 @@
 ^libraries/editline(/|$)
 ^libraries/fgl(/|$)
 ^libraries/filepath(/|$)
+^libraries/getopt(/|$)
 ^libraries/ghc-prim(/|$)
 ^libraries/haskell-src(/|$)
 ^libraries/haskell98(/|$)
@@ -72,16 +74,23 @@
 ^libraries/regex-base(/|$)
 ^libraries/regex-compat(/|$)
 ^libraries/regex-posix(/|$)
+^libraries/st(/|$)
 ^libraries/stm(/|$)
+^libraries/syb(/|$)
 ^libraries/template-haskell(/|$)
 ^libraries/time(/|$)
+^libraries/timeout(/|$)
 ^libraries/unique(/|$)
 ^libraries/unix(/|$)
 ^libraries/xhtml(/|$)
+^libraries/dph(/|$)
+^libraries/utf8-string(/|$)
+^libraries/terminfo(/|$)
+^libraries/haskeline(/|$)
+^libraries/extensible-exceptions(/|$)
 # Other library bits that get generated:
 ^libraries/bootstrapping/
 ^libraries/stamp/
-^libraries/cabal-bin$
 ^libraries/ifBuildable(/|$)
 ^libraries/installPackage(/|$)
 ^libraries/index.html
@@ -133,6 +142,8 @@
 (^|/)BitKeeper($|/)
 (^|/)ChangeSet($|/)
 (^|/)\.svn($|/)
+(^|/)\.git($|/)
+\.git-ignore$
 \.py[co]$
 \#
 \.cvsignore$
@@ -160,10 +171,13 @@
 ^compiler/utils/Fingerprint_hsc.c$
 ^mk/build.mk$
 ^mk/validate.mk$
+^mk/are-validating.mk$
 ^mk/config.h.in$
 ^mk/config.h$
 ^mk/config.mk$
 ^mk/stamp-h$
+^stage3.package.conf$
+^inplace-datadir(/|$)
 (^|/)autom4te.cache($|/)
 ^rts/AutoApply.*cmm$
 ^rts/sm/Evac_thr.c$
@@ -185,6 +199,13 @@ package.conf.installed$
 # Common log file names; testlog is made by validate
 ^testlog
 ^log
+^utils/[a-zA-Z0-9-]+/dist-install(/|$)
+^utils/[a-zA-Z0-9-]+/dist-inplace(/|$)
+^utils/[a-zA-Z0-9-]+/install-inplace(/|$)
+^compiler/Makefile-stage[1-3](/|$)
+^compiler/dist-stage[1-3](/|$)
+^ghc/dist-stage[1-3](/|$)
+^ghc/stage[1-3]-inplace(/|$)
 ^utils/ext-core/Driver$
 ^utils/ext-core/PrimEnv.hs$
 ^utils/genapply/genapply$
@@ -200,12 +221,8 @@ package.conf.installed$
 ^utils/hasktags/hasktags-inplace$
 ^utils/hp2ps/hp2ps$
 ^utils/hpc/HpcParser.hs$
-^utils/hpc/hpc$
-^utils/hpc/hpc-inplace$
-^utils/hsc2hs/hsc2hs-bin$
-^utils/hsc2hs/hsc2hs-inplace$
-^utils/hsc2hs/hsc2hs-inplace.bin$
-^utils/hsc2hs/hsc2hs-inplace.hs$
+^utils/hsc2hs(/|$)
+^utils/haddock(/|$)
 ^utils/lndir/lndir$
 ^utils/mkdependC/mkdependC$
 ^utils/mkdirhier/mkdirhier$
@@ -226,7 +243,6 @@ package.conf.installed$
 ^driver/package.conf.inplace.old$
 ^driver/split/ghc-split$
 ^driver/split/ghc-split.prl$
-^driver/stamp-pkg-conf-ghc$
 ^driver/stamp-pkg-conf-rts$
 ^includes/DerivedConstants.h$
 ^includes/GHCConstants.h$