[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-3.dsc

Kari Pahula kaol at debian.org
Sat Jan 15 06:07:35 UTC 2011


Wed Jan 27 21:37:32 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-3.dsc

    M ./changelog +14
    M ./control +1
    M ./ghc-pkg6.man.in -1 +18
    M ./ghc6.postinst.in +4
    A ./ghc6.triggers
    A ./patches/getallinfo-nothing-ghci-566331
    A ./patches/kfreebsd-_gnu_source-565818
    M ./patches/series +2

Wed Jan 27 21:37:32 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-3.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:35.580970901 +0000
+++ new-ghc/changelog	2011-01-15 06:07:35.656974904 +0000
@@ -1,3 +1,17 @@
+ghc6 (6.12.1-3) experimental; urgency=low
+
+  * Updated ghc-pkg's man page.
+  * Added a trigger to run ghc-pkg recache when files are added to
+    /var/lib/ghc-6.12.1/package.conf.d/.
+  * Patch rts/posix/OSThreads.c to define _GNU_SOURCE on kfreebsd
+    too. (Closes: #565818)
+  * Patch utils/haddock/src/Haddock/Interface/AttachInstances.hs to use
+    Nothing as mb_info in attachInstances when GHCI is
+    unavailable. (Closes: #566331)
+  * Breaks cabal-install (<< 0.8.0).
+
+ -- Kari Pahula <kaol at debian.org>  Wed, 27 Jan 2010 23:37:32 +0200
+
 ghc6 (6.12.1-2) experimental; urgency=low
 
   * Added missing build dependency: libncurses5-dev.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:07:35.580970901 +0000
+++ new-ghc/control	2011-01-15 06:07:35.656974904 +0000
@@ -11,6 +11,7 @@
 Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: haskell-compiler, ghc, ${provided-devs}
 Conflicts: ghc4 (<= 4.08.1-4)
+Breaks: cabal-install (<< 0.8.0)
 Suggests: ghc6-prof, ghc6-doc, haskell-doc
 Description: GHC - the Glasgow Haskell Compilation system
  Version 6 of the Glorious Glasgow Haskell Compilation system (GHC).  GHC is
diff -rN -u old-ghc/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in	2011-01-15 06:07:35.580970901 +0000
+++ new-ghc/ghc6.postinst.in	2011-01-15 06:07:35.636973850 +0000
@@ -37,6 +37,7 @@
 
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
+	$bindir/ghc-pkg recache
 	if [ -n "$NEED_INTERPRETER" ] ; then
             update-alternatives \
 		--install $execdir/runhaskell runhaskell $execdir/runghc6 8600000600 \
@@ -56,6 +57,9 @@
 	    --slave $mandir/man1/ghc-pkg.1.gz ghc-pkg.1.gz $mandir/man1/ghc-pkg6.1.gz \
             --slave $execdir/hasktags hasktags $bindir/hasktags $NEED_INTERPRETER
     ;;
+    triggered)
+	$bindir/ghc-pkg recache
+	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 0
diff -rN -u old-ghc/ghc6.triggers new-ghc/ghc6.triggers
--- old-ghc/ghc6.triggers	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6.triggers	2011-01-15 06:07:35.588971322 +0000
@@ -0,0 +1 @@
+interest /var/lib/ghc-6.12.1/package.conf.d
diff -rN -u old-ghc/ghc-pkg6.man.in new-ghc/ghc-pkg6.man.in
--- old-ghc/ghc-pkg6.man.in	2011-01-15 06:07:35.580970901 +0000
+++ new-ghc/ghc-pkg6.man.in	2011-01-15 06:07:35.600971954 +0000
@@ -1,4 +1,4 @@
-.TH ghc-pkg 1 "2009-05-11"
+.TH ghc-pkg 1 "2010-01-27"
 .SH NAME
 ghc-pkg \- GHC Haskell Cabal package manager
 .SH SYNOPSIS
@@ -61,6 +61,13 @@
 .B --simple-output
 flag.
 .TP
+.B dot
+Generate a graph of the package dependencies in a form suitable for
+input for the graphviz tools.  For example, to generate a PDF of the
+dependency graph:
+.br
+\fB    dot \| tred \| dot -Tpdf >pkgs.pdf\fP
+.TP
 \fBfind-module\fP \fImodule\fP
 List registered packages exposing module
 .I module
@@ -94,6 +101,16 @@
 .BR ghc-pkg\ describe\ '*' ,
 expect that it is intended to be used by tools that parse the results,
 rather than humans.
+.TP
+.B recache
+Regenerate the package database cache.  This command should only be
+necessary if you added a package to the database by dropping a file
+into the database directory manyally.  By default, the global DB is
+recached; to recache a different DB use
+.B --user
+or
+.B --package-conf
+as appropriate.
 .SH OPTIONS
 When asked to modify a database
 .RB ( register ,\  unregister ,\  update ,\  hide ,\  expose ,\ and\ also\  check ),
diff -rN -u old-ghc/patches/getallinfo-nothing-ghci-566331 new-ghc/patches/getallinfo-nothing-ghci-566331
--- old-ghc/patches/getallinfo-nothing-ghci-566331	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/getallinfo-nothing-ghci-566331	2011-01-15 06:07:35.656974904 +0000
@@ -0,0 +1,39 @@
+Index: ghc6-6.12.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs
+===================================================================
+--- ghc6-6.12.1.orig/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2010-01-27 22:13:25.000000000 +0200
++++ ghc6-6.12.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2010-01-27 22:19:17.000000000 +0200
+@@ -25,7 +25,9 @@
+ import InstEnv
+ import Class
+ import HscTypes (withSession, ioMsg)
++#ifdef GHCI
+ import TcRnDriver (tcRnGetInfo)
++#endif
+ 
+ #if __GLASGOW_HASKELL__ > 610 || (__GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ >= 2)
+ import TypeRep hiding (funTyConName)
+@@ -48,7 +50,11 @@
+       return $ iface { ifaceExportItems = newItems }
+ 
+     attachExport export at ExportDecl{expItemDecl = L _ (TyClD d)} = do
++#ifdef GHCI
+        mb_info <- getAllInfo (unLoc (tcdLName d))
++#else
++       let mb_info = Nothing
++#endif
+        return $ export { expItemInstances = case mb_info of
+          Just (_, _, instances) ->
+            map synifyInstHead . sortImage instHead . map instanceHead $ instances
+@@ -58,10 +64,12 @@
+     attachExport export = return export
+ 
+ 
++#ifdef GHCI
+ -- | Like GHC's getInfo but doesn't cut things out depending on the
+ -- interative context, which we don't set sufficiently anyway.
+ getAllInfo :: GhcMonad m => Name -> m (Maybe (TyThing,Fixity,[Instance]))
+ getAllInfo name = withSession $ \hsc_env -> ioMsg $ tcRnGetInfo hsc_env name
++#endif
+ 
+ --------------------------------------------------------------------------------
+ -- Collecting and sorting instances
diff -rN -u old-ghc/patches/kfreebsd-_gnu_source-565818 new-ghc/patches/kfreebsd-_gnu_source-565818
--- old-ghc/patches/kfreebsd-_gnu_source-565818	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/kfreebsd-_gnu_source-565818	2011-01-15 06:07:35.656974904 +0000
@@ -0,0 +1,17 @@
+Index: ghc6-6.12.1/rts/posix/OSThreads.c
+===================================================================
+--- ghc6-6.12.1.orig/rts/posix/OSThreads.c	2010-01-27 21:55:58.000000000 +0200
++++ ghc6-6.12.1/rts/posix/OSThreads.c	2010-01-27 21:56:53.000000000 +0200
+@@ -7,10 +7,10 @@
+  *
+  * --------------------------------------------------------------------------*/
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GLIBC__)
+ /* We want GNU extensions in DEBUG mode for mutex error checking */
+ /* We also want the affinity API, which requires _GNU_SOURCE */
+-#define _GNU_SOURCE
++#define _GNU_SOURCE 1
+ #endif
+ 
+ #include "PosixSource.h"
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 06:07:35.580970901 +0000
+++ new-ghc/patches/series	2011-01-15 06:07:35.648974482 +0000
@@ -1,3 +1,5 @@
 system-libffi
 panic-debian-message
 use-debian-gen_contents_index
+kfreebsd-_gnu_source-565818
+getallinfo-nothing-ghci-566331





More information about the Pkg-haskell-commits mailing list