[Pkg-haskell-commits] darcs: ghc: Merge form unstable repo

[Joachim Breitner]

Tue Oct 16 07:56:27 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge form unstable repo
  Ignore-this: 9b994d22707bc7ebdb67648a5f8c1ce9

    M ./changelog +41
    R ./haddock-collect

Tue Oct 16 07:56:27 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Merge form unstable repo
  Ignore-this: 9b994d22707bc7ebdb67648a5f8c1ce9
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-10-16 07:59:37.635903734 +0000
+++ new-ghc//changelog	2012-10-16 07:59:37.699721083 +0000
@@ -1,3 +1,44 @@
+ghc (7.6.1-2) UNRELEASED; urgency=low
+
+  [ Joachim Breitner ]
+  * Bump standards version, no change
+
+ -- Kiwamu Okabe <kiwamu at debian.or.jp>  Sun, 07 Oct 2012 17:44:33 +0900
+
+ghc (7.6.1-2) experimental; urgency=low
+
+  * Do not Provide transformers, it is only used internally.
+  * Ensure this is not used with unstable’s haskell-devscripts 
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 08 Oct 2012 22:41:46 +0200
+
+ghc (7.6.1-1) experimental; urgency=low
+
+  * New upstream release 
+    Dropped patches, applied upstream:
+     + Fix-GHCi-segfault-on-linux-powerpc
+     + hurd-is-ELF
+     + use-llvm-3.0
+     + memcpy-ffi
+     + fix-PPC-right-shift-bug
+     + no-useless-time
+     + fix-ppc-ghci-segfault
+  * Configure the use of llc-3.0 and opt-3.0 via ./configure 
+  * Bump standards version
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 08 Oct 2012 15:48:21 +0200
+
+ghc (7.4.2-2) experimental; urgency=low
+
+  [ Erik de Castro Lopo ]
+  * Add patch to fix GHCi segfault on startup on PowerPC (Closes: #631073).
+  * Remove patch no_ghci_on_powerpc.
+
+  [ Iain Lane ]
+  * Update Vcs-* to point to experimental branch
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Mon,  6 Aug 2012 20:19:46 +1000
+
 ghc (7.4.2-1) experimental; urgency=low
 
    * New upstream.
diff -rN -u old-ghc//haddock-collect new-ghc//haddock-collect
--- old-ghc//haddock-collect	2012-10-16 07:59:37.635903734 +0000
+++ new-ghc//haddock-collect	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#!/usr/bin/runhaskell
-{-# OPTIONS -Wall #-}
-
-import Data.List
-import Data.Maybe
-import System.Environment
-import System.FilePath
-
-type URL = String
-
--- copy from hoogle/src/Recipe/Hackage.hs
-haddockPackageUrl :: URL -> [String] -> [String]
-haddockPackageUrl x = concatMap f
-    where f y | "@package " `isPrefixOf` y = ["@url " ++ x, y]
-              | otherwise = [y]
--- copy end
-
-filterHaddock :: URL -> String -> String
-filterHaddock url = unlines . haddockPackageUrl url . lines
-
-readAndPrint :: FilePath -> FilePath -> FilePath -> IO ()
-readAndPrint strip outdir file = do
-  f <- readFile file
-  writeFile outfile $ filterHaddock url f
-    where outfile = outdir </> takeFileName file
-          url = normalise $ "file:/" ++ (fromMaybe "" . stripPrefix strip . dropFileName $ file)
-
-usage :: IO ()
-usage = putStrLn "Usage: echo SOMEWHERE/HOOGLE_DATABASE.txt | haddock-collect STRIP OUTDIR"
-
-main :: IO ()
-main = do
-  a <- getArgs
-  if a == [] || a == ["-h"] || length a /= 2 then usage
-    else do c <- getContents
-            mapM_ (readAndPrint (a !! 0) (a !! 1)) (lines c)