[DHG_packages] 01/01: ghc: ghc-8.0.1-rc2

Mon Feb 8 13:43:51 UTC 2016

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to annotated tag ghc_v8.0.0.20160204-1
in repository DHG_packages.

commit 3734621d2143ed45b06bb93702feb6eacd17eb17
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 8 12:35:01 2016 +0100

    ghc: ghc-8.0.1-rc2
---
 p/ghc/debian/changelog                               |  8 ++++++--
 p/ghc/debian/patches/D1782.diff                      | 18 ------------------
 p/ghc/debian/patches/no-missing-haddock-file-warning |  6 +++---
 p/ghc/debian/patches/reproducible-tmp-names          |  4 ++--
 p/ghc/debian/patches/series                          |  1 -
 p/ghc/debian/patches/use-debian-gen_contents_index   | 10 +++++-----
 6 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 9af7d18..8cd4279 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,9 +1,13 @@
-ghc (8.0.0.20160111-4) UNRELEASED; urgency=medium
+ghc (8.0.0.20160204-1) experimental; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Re-enable and refresh patches/armel-revert-ghci-fixes.patch on armel.
     - drop a little part on Linker.c, upstreamed.
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 18 Jan 2016 16:28:09 +0100
+  [ Joachim Breitner ]
+  * New upstream release candidate (8.0.1-rc2)
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 08 Feb 2016 12:34:51 +0100
 
 ghc (8.0.0.20160111-3) experimental; urgency=medium
 
diff --git a/p/ghc/debian/patches/D1782.diff b/p/ghc/debian/patches/D1782.diff
deleted file mode 100644
index 7fa1fd4..0000000
--- a/p/ghc/debian/patches/D1782.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: ghc/docs/users_guide/ghc.mk
-===================================================================
---- ghc.orig/docs/users_guide/ghc.mk	2016-01-15 13:20:22.354615064 +0100
-+++ ghc/docs/users_guide/ghc.mk	2016-01-15 13:20:22.350614982 +0100
-@@ -23,11 +23,11 @@
- docs/users_guide_MAN_RST_SOURCES := docs/users_guide/ghc.rst
- 
- MAN_SECTION := 1
--MAN_PAGES := docs/users_guide/ghc.1
-+MAN_PAGES := docs/users_guide/build-man/ghc.1
- 
- ifneq "$(BINDIST)" "YES"
- $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERATED_RST_SOURCES)
--	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide
-+	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide/build-man
- endif
- 
- man : $(MAN_PAGES)
diff --git a/p/ghc/debian/patches/no-missing-haddock-file-warning b/p/ghc/debian/patches/no-missing-haddock-file-warning
index 2241b28..363525a 100644
--- a/p/ghc/debian/patches/no-missing-haddock-file-warning
+++ b/p/ghc/debian/patches/no-missing-haddock-file-warning
@@ -5,9 +5,9 @@ Author: Joachim Breitner <nomeata at debian.org>
 
 Index: ghc/utils/ghc-pkg/Main.hs
 ===================================================================
---- ghc.orig/utils/ghc-pkg/Main.hs	2016-01-14 16:19:29.426554736 +0100
-+++ ghc/utils/ghc-pkg/Main.hs	2016-01-14 16:19:29.426554736 +0100
-@@ -1592,8 +1592,10 @@
+--- ghc.orig/utils/ghc-pkg/Main.hs	2016-02-08 11:31:08.897241576 +0100
++++ ghc/utils/ghc-pkg/Main.hs	2016-02-08 11:31:08.893241486 +0100
+@@ -1585,8 +1585,10 @@
    mapM_ (checkDir True  "library-dirs") (libraryDirs pkg)
    mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
    mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
index f6f7922..08b852c 100644
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ b/p/ghc/debian/patches/reproducible-tmp-names
@@ -6,8 +6,8 @@ and assume that is going to be unique.
 
 Index: ghc/compiler/main/SysTools.hs
 ===================================================================
---- ghc.orig/compiler/main/SysTools.hs	2016-01-14 16:21:54.613495968 +0100
-+++ ghc/compiler/main/SysTools.hs	2016-01-14 16:21:54.609495887 +0100
+--- ghc.orig/compiler/main/SysTools.hs	2016-02-08 11:31:17.369434835 +0100
++++ ghc/compiler/main/SysTools.hs	2016-02-08 11:31:17.365434743 +0100
 @@ -65,6 +65,7 @@
  import Util
  import DynFlags
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index b788f3d..304fbe4 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -4,5 +4,4 @@ no-missing-haddock-file-warning
 hurd.diff
 buildpath-abi-stability.patch
 reproducible-tmp-names
-D1782.diff
 haddock-mathjax-fix
diff --git a/p/ghc/debian/patches/use-debian-gen_contents_index b/p/ghc/debian/patches/use-debian-gen_contents_index
index 9a49a5b..50527b2 100644
--- a/p/ghc/debian/patches/use-debian-gen_contents_index
+++ b/p/ghc/debian/patches/use-debian-gen_contents_index
@@ -1,8 +1,8 @@
 Index: ghc/ghc.mk
 ===================================================================
---- ghc.orig/ghc.mk	2016-01-14 16:17:38.580310120 +0100
-+++ ghc/ghc.mk	2016-01-14 16:19:06.634093119 +0100
-@@ -810,7 +810,6 @@
+--- ghc.orig/ghc.mk	2016-02-08 11:31:04.941151303 +0100
++++ ghc/ghc.mk	2016-02-08 11:31:04.937151211 +0100
+@@ -808,7 +808,6 @@
  # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +10,7 @@ Index: ghc/ghc.mk
  ifeq "$(phase)" "final"
  $(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
  endif
-@@ -931,12 +930,8 @@
+@@ -929,12 +928,8 @@
  	$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
  	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +24,7 @@ Index: ghc/ghc.mk
  endif
  ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
  # We need to filter out the directories so install doesn't choke on them
-@@ -1051,7 +1046,6 @@
+@@ -1049,7 +1044,6 @@
      mk/project.mk \
      mk/install.mk.in \
      bindist.mk \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git

