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

[Joachim Breitner]

Mon Oct  8 11:10:55 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh use-debian-gen_contents_index
  Ignore-this: 610566198e684c85c568d4d9a3a90ab5

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

Mon Oct  8 11:10:55 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh use-debian-gen_contents_index
  Ignore-this: 610566198e684c85c568d4d9a3a90ab5
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	2012-10-16 07:59:02.810244731 +0000
+++ new-ghc//patches/use-debian-gen_contents_index	2012-10-16 07:59:02.835719027 +0000
@@ -1,16 +1,16 @@
-Index: ghc-7.4.0.20111219/ghc.mk
+Index: ghc-7.6.1/ghc.mk
 ===================================================================
---- ghc-7.4.0.20111219.orig/ghc.mk	2011-12-21 19:45:08.000000000 +0100
-+++ ghc-7.4.0.20111219/ghc.mk	2011-12-21 19:51:20.000000000 +0100
-@@ -666,7 +666,6 @@
+--- ghc-7.6.1.orig/ghc.mk	2012-10-08 13:06:55.000000000 +0200
++++ ghc-7.6.1/ghc.mk	2012-10-08 13:10:37.135879088 +0200
+@@ -701,7 +701,6 @@
  # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
- libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
+ libraries/dist-haddock/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
 -	cd libraries && sh gen_contents_index --inplace
  ifeq "$(phase)" "final"
- $(eval $(call all-target,library_doc_index,libraries/index.html))
+ $(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
  endif
-@@ -833,12 +832,8 @@
+@@ -864,12 +863,8 @@
  	$(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
  	$(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +24,7 @@
  endif
  ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
  	for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -946,7 +941,6 @@
+@@ -980,7 +975,6 @@
      mk/project.mk \
      mk/install.mk.in \
      bindist.mk \