[Pkg-haskell-commits] darcs: ghc: Refresh use-debian-gen_contents_index

[Joachim Breitner]

Sat Jan 15 07:12:27 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh use-debian-gen_contents_index
  Ignore-this: 98c9d5f453e829fddef8ae115828cc4a

    M ./patches/use-debian-gen_contents_index -14 +14

Sat Jan 15 07:12:27 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh use-debian-gen_contents_index
  Ignore-this: 98c9d5f453e829fddef8ae115828cc4a
diff -rN -u old-ghc/patches/use-debian-gen_contents_index new-ghc/patches/use-debian-gen_contents_index
--- old-ghc/patches/use-debian-gen_contents_index	2011-01-15 07:13:09.236117241 +0000
+++ new-ghc/patches/use-debian-gen_contents_index	2011-01-15 07:13:09.248117873 +0000
@@ -1,16 +1,16 @@
-Index: ghc6-6.12.1/ghc.mk
+Index: ghc-7.0.1/ghc.mk
 ===================================================================
---- ghc6-6.12.1.orig/ghc.mk	2010-01-11 02:28:48.000000000 +0200
-+++ ghc6-6.12.1/ghc.mk	2010-01-11 16:00:43.000000000 +0200
-@@ -628,7 +628,6 @@
- 
+--- ghc-7.0.1.orig/ghc.mk	2011-01-15 12:30:20.000000000 +0530
++++ ghc-7.0.1/ghc.mk	2011-01-15 12:42:21.000000000 +0530
+@@ -694,7 +694,6 @@
+ # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/index.html: $(ALL_HADDOCK_FILES)
 -	cd libraries && sh gen_contents_index --inplace
  $(eval $(call all-target,library_doc_index,libraries/index.html))
  INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
  CLEAN_FILES += libraries/doc-index* libraries/haddock*.css \
-@@ -813,12 +812,8 @@
+@@ -887,12 +886,8 @@
  	$(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html"
  	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,11 +24,11 @@
  endif
  ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
  	for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -922,7 +917,6 @@
- 	mk/project.mk \
- 	mk/install.mk.in \
- 	bindist.mk \
--	libraries/gen_contents_index \
- 	libraries/prologue.txt \
- 	libraries/dph/LICENSE \
-  ))
+@@ -1000,7 +995,6 @@
+     mk/project.mk \
+     mk/install.mk.in \
+     bindist.mk \
+-    libraries/gen_contents_index \
+     libraries/prologue.txt \
+     $(wildcard libraries/dph/LICENSE \
+                libraries/dph/ghc-packages \