[Pkg-haskell-commits] darcs: haskell-hgl: New upstream release
Joachim Breitner
mail at joachim-breitner.de
Mon Aug 4 22:38:19 UTC 2014
Mon Aug 4 21:43:54 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
M ./changelog -2 +3
M ./control -4
R ./patches/00-cabal-rules.patch
R ./patches/01-new-exceptions.patch
R ./patches/02-exceptions.patch
R ./patches/03-channel.patch
R ./patches/series
R ./patches/
Mon Aug 4 21:43:54 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
diff -rN -u old-haskell-hgl/changelog new-haskell-hgl/changelog
--- old-haskell-hgl/changelog 2014-08-04 22:38:18.941763629 +0000
+++ new-haskell-hgl/changelog 2014-08-04 22:38:18.945763633 +0000
@@ -1,8 +1,9 @@
-haskell-hgl (3.2.0.2-3) UNRELEASED; urgency=low
+haskell-hgl (3.2.0.5-1) UNRELEASED; urgency=low
* Adjust watch file to new hackage layout
+ * New upstream release
- -- Joachim Breitner <nomeata at debian.org> Sat, 05 Oct 2013 18:20:33 +0200
+ -- Joachim Breitner <nomeata at debian.org> Mon, 04 Aug 2014 23:13:33 +0200
haskell-hgl (3.2.0.2-2) unstable; urgency=low
diff -rN -u old-haskell-hgl/control new-haskell-hgl/control
--- old-haskell-hgl/control 2014-08-04 22:38:18.941763629 +0000
+++ new-haskell-hgl/control 2014-08-04 22:38:18.941763629 +0000
@@ -9,15 +9,11 @@
cdbs,
debhelper (>= 9),
haskell-devscripts (>= 0.8.12),
- quilt,
ghc,
ghc-prof,
- libghc-stm-dev,
- libghc-stm-prof,
libghc-x11-dev,
libghc-x11-prof
Build-Depends-Indep: ghc-doc,
- libghc-stm-doc,
libghc-x11-doc
Homepage: http://hackage.haskell.org/package/HGL
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hgl
diff -rN -u old-haskell-hgl/patches/00-cabal-rules.patch new-haskell-hgl/patches/00-cabal-rules.patch
--- old-haskell-hgl/patches/00-cabal-rules.patch 2014-08-04 22:38:18.937763626 +0000
+++ new-haskell-hgl/patches/00-cabal-rules.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-Description: Change cabal file to include proper dependencies for
- building with GHC 7.4.
-Forwarded: yes
-Author: Ernesto Hernández-Novich (USB) <emhn at usb.ve>
-
---- a/HGL.cabal
-+++ b/HGL.cabal
-@@ -22,7 +22,7 @@
-
- library
- if flag(split-base)
-- build-depends: base >= 3 && < 4, array
-+ build-depends: base >= 3, array, stm
- else
- build-depends: base < 2
- exposed-modules:
diff -rN -u old-haskell-hgl/patches/01-new-exceptions.patch new-haskell-hgl/patches/01-new-exceptions.patch
--- old-haskell-hgl/patches/01-new-exceptions.patch 2014-08-04 22:38:18.937763626 +0000
+++ new-haskell-hgl/patches/01-new-exceptions.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Description: Convert old-style try/catch to new-style Control.Exception
- style. This gets rids of several compilation warnings. I left this
- patch separate because I removed an #ifdef and am not sure if this is
- the best way to solve the issue.
-Forwarded: yes
-Author: Ernesto Hernández-Novich <emhn at usb.ve>
-
---- a/Graphics/HGL/Internals/Utilities.hs
-+++ b/Graphics/HGL/Internals/Utilities.hs
-@@ -20,7 +20,7 @@
- modMVar, modMVar_
- ) where
-
--import qualified Control.Exception as E (bracket, try, IOException, tryJust, ioErrors)
-+import qualified Control.Exception as E (bracket, try, IOException, tryJust)
- import Control.Concurrent( MVar, takeMVar, putMVar )
-
- bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c
-@@ -32,14 +32,7 @@
-
- type Exception = E.IOException
- safeTry :: IO a -> IO (Either Exception a)
--
--#if __GLASGOW_HASKELL >= 610
---- ghc-6.10
- safeTry = E.try
--#else
---- ghc 6.8 (and below?)
--safeTry = E.tryJust E.ioErrors
--#endif
-
-
- ----------------------------------------------------------------
diff -rN -u old-haskell-hgl/patches/02-exceptions.patch new-haskell-hgl/patches/02-exceptions.patch
--- old-haskell-hgl/patches/02-exceptions.patch 2014-08-04 22:38:18.937763626 +0000
+++ new-haskell-hgl/patches/02-exceptions.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-Description: Convert old-style try/catch to new-style Control.Exception
- style. This gets rids of several compilation warnings.
-Forwarded: yes
-Author: Ernesto Hernández-Novich <emhn at usb.ve>
-
---- a/Graphics/HGL/X11/Display.hs
-+++ b/Graphics/HGL/X11/Display.hs
-@@ -1,3 +1,5 @@
-+{-# LANGUAGE ScopedTypeVariables #-}
-+
- -- #hide
- module Graphics.HGL.X11.Display
- ( getDisplayName
-@@ -14,12 +16,13 @@
- import Control.Monad (when)
- import Data.Maybe (isJust)
- import System.Environment (getEnv)
--import System.IO.Error (try)
- import System.IO.Unsafe (unsafePerformIO)
-
-+import qualified Control.Exception as CE
-+
- getDisplayName :: IO String
- getDisplayName = do
-- disp <- try (getEnv "DISPLAY")
-+ disp <- CE.try (getEnv "DISPLAY") :: IO (Either CE.IOException String)
- return (either (const ":0.0") id disp)
-
- displayRef :: MVar (Maybe X.Display)
-@@ -32,8 +35,9 @@
- openDisplay'
- where
- openDisplay' = do
-- display <- X.openDisplay host `catch` \ err ->
-- ioError (userError ("Unable to open X display " ++ host))
-+ display <- X.openDisplay host
-+ `CE.catch`
-+ (\(e :: CE.SomeException) -> ioError $ userError $ "Unable to open X display " ++ host)
- modMVar displayRef (const $ Just display)
- return display
-
---- a/Graphics/HGL/X11/Types.hs
-+++ b/Graphics/HGL/X11/Types.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE ScopedTypeVariables #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Graphics.HGL.X11.Types
-@@ -26,6 +27,7 @@
- import Graphics.HGL.Internals.Types
-
- import qualified Graphics.X11.Xlib as X
-+import qualified Control.Exception as CE
-
- import Control.Concurrent.MVar (MVar)
- import Data.Bits
-@@ -84,7 +86,7 @@
- (X.Color p _ _ _ _) <-
- X.allocColor display color_map (X.Color 0 r g b xcolor_flags)
- return p)
-- `catch` \ err ->
-+ `CE.catch` \(err :: CE.SomeException) ->
- print err >> return 0
- -- ioError (userError ("Error: " ++ show err
- -- ++ "\nUnable to allocate colo[u]r " ++ show (r,g,b)
diff -rN -u old-haskell-hgl/patches/03-channel.patch new-haskell-hgl/patches/03-channel.patch
--- old-haskell-hgl/patches/03-channel.patch 2014-08-04 22:38:18.937763626 +0000
+++ new-haskell-hgl/patches/03-channel.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-Description: Stop using Control.Concurrent.Chan and migrate to the
- more modern Control.Concurrent.STM.TChan. Migration was triggered
- by the fact that the library needs isEmptyChan and GHC 7.4 suggest
- using STM's version instead.
-Forwarded: yes
-Author: Ernesto Hernández-Novich (USB) <emhn at usb.ve>
-
---- a/Graphics/HGL/Internals/Events.hs
-+++ b/Graphics/HGL/Internals/Events.hs
-@@ -20,7 +20,8 @@
-
- import Graphics.HGL.Internals.Event
- import Graphics.HGL.Internals.Flag
--import Control.Concurrent.Chan(Chan, newChan, readChan, writeChan, isEmptyChan)
-+import Control.Concurrent.STM (atomically)
-+import Control.Concurrent.STM.TChan (TChan, newTChan, readTChan, writeTChan, isEmptyTChan)
-
- ----------------------------------------------------------------
- -- Interface
-@@ -37,7 +38,7 @@
- -- of the Graphics library). Exposure events in X11 behave in a
- -- similar way except that they do not overtake other events.)
-
--data Events = Events { events :: Chan Event
-+data Events = Events { events :: TChan Event
- , tick :: Flag ()
- }
-
-@@ -53,13 +54,13 @@
- ----------------------------------------------------------------
-
- newEvents = do
-- events <- newChan
-+ events <- atomically $ newTChan
- tick <- newFlag
- return (Events { events=events, tick=tick })
-
--getEvent evs = readChan (events evs)
--isNoEvent evs = isEmptyChan (events evs)
--sendEvent evs = writeChan (events evs)
-+getEvent evs = atomically $ readTChan (events evs)
-+isNoEvent evs = atomically $ isEmptyTChan (events evs)
-+sendEvent evs = atomically . writeTChan (events evs)
- sendTick evs = setFlag (tick evs) ()
- getTick evs = resetFlag (tick evs)
-
diff -rN -u old-haskell-hgl/patches/series new-haskell-hgl/patches/series
--- old-haskell-hgl/patches/series 2014-08-04 22:38:18.937763626 +0000
+++ new-haskell-hgl/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-00-cabal-rules.patch
-01-new-exceptions.patch
-02-exceptions.patch
-03-channel.patch
More information about the Pkg-haskell-commits
mailing list