[Pkg-haskell-commits] darcs: haskell-haddock: * New upstream release specified by Haskell platform 2011.2.0.1
laney at debian.org
laney at debian.org
Wed Jun 15 13:13:30 UTC 2011
Wed Jun 15 13:13:25 UTC 2011 laney at debian.org
* * New upstream release specified by Haskell platform 2011.2.0.1
Ignore-this: d927db713e0859cf9d563aae84be7430
* debian/control: Update BDs in line with new upstream release
* d/patches/build_without_ghci.patch: Update/refresh vs. 2.9.2
* Standards-Version [_\e2_][_\86_][_\92_] 3.9.2, no changes required
M ./changelog -2 +14
M ./control -3 +11
M ./patches/build_without_ghci.patch -33 +32
M ./rules -1 +2
Wed Jun 15 13:13:25 UTC 2011 laney at debian.org
* * New upstream release specified by Haskell platform 2011.2.0.1
Ignore-this: d927db713e0859cf9d563aae84be7430
* debian/control: Update BDs in line with new upstream release
* d/patches/build_without_ghci.patch: Update/refresh vs. 2.9.2
* Standards-Version → 3.9.2, no changes required
diff -rN -u old-haskell-haddock//changelog new-haskell-haddock//changelog
--- old-haskell-haddock//changelog 2011-06-15 13:13:30.732032701 +0000
+++ new-haskell-haddock//changelog 2011-06-15 13:13:30.732032701 +0000
@@ -1,8 +1,20 @@
-haskell-haddock (2.7.2-6) UNRELEASED; urgency=low
+haskell-haddock (2.9.2-1) unstable; urgency=low
+ * New upstream release specified by Haskell platform 2011.2.0.1
+ * debian/control: Update BDs in line with new upstream release
+ * d/patches/build_without_ghci.patch: Update/refresh vs. 2.9.2
+
+ -- Iain Lane <laney at debian.org> Fri, 27 May 2011 17:39:16 +0100
+
+haskell-haddock (2.7.2-6) unstable; urgency=low
+
+ [ Marco Silva ]
* Use ghc instead of ghc6
- -- Marco Silva <marcot at debian.org> Sat, 15 Jan 2011 12:41:02 -0200
+ [ Iain Lane ]
+ * Standards-Version → 3.9.2, no changes required
+
+ -- Iain Lane <laney at debian.org> Fri, 27 May 2011 14:35:10 +0100
haskell-haddock (2.7.2-5) unstable; urgency=low
diff -rN -u old-haskell-haddock//control new-haskell-haddock//control
--- old-haskell-haddock//control 2011-06-15 13:13:30.721289618 +0000
+++ new-haskell-haddock//control 2011-06-15 13:13:30.737275037 +0000
@@ -6,14 +6,22 @@
Build-Depends: debhelper (>= 7)
, cdbs
, haskell-devscripts (>= 0.7)
- , ghc
- , ghc-prof
+ , ghc (>= 7.0)
+ , ghc (<< 7.2)
+ , ghc-prof (>= 7.0)
+ , ghc-prof (<< 7.2)
, libghc-ghc-paths-dev
, libghc-ghc-paths-prof
+ , libghc-xhtml-dev (>= 3000.2)
+ , libghc-xhtml-dev (<< 3000.3)
+ , libghc-xhtml-prof (>= 3000.2)
+ , libghc-xhtml-prof (<< 3000.3)
, alex
, happy
Build-Depends-Indep: ghc-doc
-Standards-Version: 3.9.0
+ , libghc-ghc-paths-doc
+ , libghc-xhtml-doc
+Standards-Version: 3.9.2
Homepage: http://hackage.haskell.org/package/haddock
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-haddock
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-haddock
diff -rN -u old-haskell-haddock//patches/build_without_ghci.patch new-haskell-haddock//patches/build_without_ghci.patch
--- old-haskell-haddock//patches/build_without_ghci.patch 2011-06-15 13:13:30.701290475 +0000
+++ new-haskell-haddock//patches/build_without_ghci.patch 2011-06-15 13:13:30.737275037 +0000
@@ -1,48 +1,47 @@
-Index: haskell-haddock-2.7.2/src/Haddock/Interface/AttachInstances.hs
+Index: haskell-haddock-2.9.2/src/Haddock/Interface/AttachInstances.hs
===================================================================
---- haskell-haddock-2.7.2.orig/src/Haddock/Interface/AttachInstances.hs 2010-07-02 09:13:14.000000000 +0200
-+++ haskell-haddock-2.7.2/src/Haddock/Interface/AttachInstances.hs 2010-07-02 09:13:17.000000000 +0200
-@@ -27,7 +27,10 @@
- import InstEnv
- import Class
- import HscTypes (withSession, ioMsg)
+--- haskell-haddock-2.9.2.orig/src/Haddock/Interface/AttachInstances.hs 2011-05-27 17:17:47.022293394 +0100
++++ haskell-haddock-2.9.2/src/Haddock/Interface/AttachInstances.hs 2011-05-27 17:38:35.193733579 +0100
+@@ -31,7 +31,9 @@
+ import HscTypes (withSession)
+ #endif
+ import MonadUtils (liftIO)
+#ifdef GHCI
import TcRnDriver (tcRnGetInfo)
+#endif
-+
import TypeRep hiding (funTyConName)
import Var hiding (varName)
import TyCon
-@@ -44,7 +47,11 @@
- return $ iface { ifaceExportItems = newItems }
- where
- attachExport export at ExportDecl{expItemDecl = L _ (TyClD d)} = do
+@@ -56,7 +58,11 @@
+ attachToExportItem iface ifaceMap instIfaceMap export =
+ case export of
+ ExportDecl { expItemDecl = L _ (TyClD d) } -> do
+#ifdef GHCI
- mb_info <- getAllInfo (unLoc (tcdLName d))
+ mb_info <- getAllInfo (unLoc (tcdLName d))
+#else
-+ let mb_info = Nothing
++ let mb_info = Nothing
+#endif
- return $ export { expItemInstances = case mb_info of
- Just (_, _, instances) ->
- let insts = map (first synifyInstHead) $ sortImage (first instHead)
-@@ -70,10 +77,12 @@
- modName = nameModule name
-
+ let export' =
+ export {
+ expItemInstances =
+@@ -97,10 +103,12 @@
-+#ifdef GHCI
-- | Like GHC's getInfo but doesn't cut things out depending on the
-- interative context, which we don't set sufficiently anyway.
++#ifdef GHCI
getAllInfo :: GhcMonad m => Name -> m (Maybe (TyThing,Fixity,[Instance]))
- getAllInfo name = withSession $ \hsc_env -> ioMsg $ tcRnGetInfo hsc_env name
+ getAllInfo name = withSession $ \hsc_env -> do
+ (_msgs, r) <- liftIO $ tcRnGetInfo hsc_env name
+ return r
+#endif
--------------------------------------------------------------------------------
-Index: haskell-haddock-2.7.2/haddock.cabal
+Index: haskell-haddock-2.9.2/haddock.cabal
===================================================================
---- haskell-haddock-2.7.2.orig/haddock.cabal 2010-07-02 09:18:05.000000000 +0200
-+++ haskell-haddock-2.7.2/haddock.cabal 2010-07-02 09:18:12.000000000 +0200
-@@ -67,6 +67,10 @@
+--- haskell-haddock-2.9.2.orig/haddock.cabal 2011-05-27 17:17:47.052292123 +0100
++++ haskell-haddock-2.9.2/haddock.cabal 2011-05-27 17:24:23.000000000 +0100
+@@ -72,6 +72,10 @@
default: False
manual: True
@@ -51,9 +50,9 @@
+ manual: True
+
executable haddock
+ default-language: Haskell2010
build-depends:
- base >= 4.0.0.0 && < 4.3.0.0,
-@@ -139,6 +143,9 @@
+@@ -154,6 +158,9 @@
cpp-options: -DTEST
build-depends: QuickCheck >= 2.1 && < 3
@@ -61,13 +60,13 @@
+ cpp-options: -DGHCI
+
hs-source-dirs: src
- extensions: CPP, PatternGuards, DeriveDataTypeable,
+ default-extensions: CPP, DeriveDataTypeable,
ScopedTypeVariables, MagicHash
-Index: haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs
+Index: haskell-haddock-2.9.2/src/Haddock/Interface/Create.hs
===================================================================
---- haskell-haddock-2.7.2.orig/src/Haddock/Interface/Create.hs 2010-03-20 15:47:22.000000000 +0100
-+++ haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs 2010-07-02 09:57:33.000000000 +0200
-@@ -501,7 +501,11 @@
+--- haskell-haddock-2.9.2.orig/src/Haddock/Interface/Create.hs 2011-05-27 17:17:47.012293842 +0100
++++ haskell-haddock-2.9.2/src/Haddock/Interface/Create.hs 2011-05-27 17:24:23.000000000 +0100
+@@ -518,7 +518,11 @@
Nothing -> do
-- If we can't find the declaration, it must belong to
-- another package
diff -rN -u old-haskell-haddock//rules new-haskell-haddock//rules
--- old-haskell-haddock//rules 2011-06-15 13:13:30.588043831 +0000
+++ new-haskell-haddock//rules 2011-06-15 13:13:30.739812176 +0000
@@ -3,7 +3,8 @@
DEB_BUILD_DEPENDENCIES = build-arch
# Test if ghci is available
-DEB_SETUP_GHC6_CONFIGURE_ARGS := $(shell test -e /usr/bin/ghci && echo --flags=ghci || echo --flags=-ghci)
+#DEB_SETUP_GHC6_CONFIGURE_ARGS := $(shell test -e /usr/bin/ghci && echo --flags=ghci || echo --flags=-ghci)
+#DEB_SETUP_GHC6_CONFIGURE_ARGS := --flags=-ghci
include /usr/share/cdbs/1/rules/debhelper.mk
More information about the Pkg-haskell-commits
mailing list