[Pkg-haskell-commits] darcs: threadscope: cairo-types-ambiguouty

[Sven Bartscher]

Tue May 20 21:59:29 UTC 2014  Sven Bartscher <sven.bartscher at weltraumschlangen.de>
  * cairo-types-ambiguouty

    M ./changelog -1 +3
    M ./control -1 +1
    A ./patches/
    A ./patches/ambigiouty-cairo-types.patch
    A ./patches/series

Tue May 20 21:59:29 UTC 2014  Sven Bartscher <sven.bartscher at weltraumschlangen.de>
  * cairo-types-ambiguouty
diff -rN -u old-threadscope/changelog new-threadscope/changelog
--- old-threadscope/changelog	2014-05-20 22:00:33.693568997 +0000
+++ new-threadscope/changelog	2014-05-20 22:00:33.693568997 +0000
@@ -1,8 +1,10 @@
 threadscope (0.2.2-3) UNRELEASED; urgency=low
 
+  * Resolve ambiguous symbols which were added in cairo (Closes: 746076)
   * Adjust watch file to new hackage layout
+  * Bump Standards-Version, no action
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 20:43:24 +0200
+ -- Sven Bartscher <sven.bartscher at weltraumschlangen.de>  Tue, 20 May 2014 23:42:30 +0200
 
 threadscope (0.2.2-2) unstable; urgency=low
 
diff -rN -u old-threadscope/control new-threadscope/control
--- old-threadscope/control	2014-05-20 22:00:33.693568997 +0000
+++ new-threadscope/control	2014-05-20 22:00:33.697568998 +0000
@@ -12,7 +12,7 @@
  libghc-cairo-dev,
  libghc-glib-dev,
  libghc-pango-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/threadscope
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/threadscope
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/threadscope
diff -rN -u old-threadscope/patches/ambigiouty-cairo-types.patch new-threadscope/patches/ambigiouty-cairo-types.patch
--- old-threadscope/patches/ambigiouty-cairo-types.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-threadscope/patches/ambigiouty-cairo-types.patch	2014-05-20 22:00:33.697568998 +0000
@@ -0,0 +1,38 @@
+Desciption: Resolves an issue with new symbols in cairo
+Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746076
+Forwarded: No
+Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
+Last-Update: 2014-05-20
+--- a/GUI/Timeline/Render.hs
++++ b/GUI/Timeline/Render.hs
+@@ -21,7 +21,7 @@
+ import GUI.Timeline.CairoDrawing
+ 
+ import Graphics.UI.Gtk
+-import Graphics.Rendering.Cairo
++import Graphics.Rendering.Cairo hiding (RectangleInt, height, width, Region)
+ 
+ import Data.IORef
+ import Control.Monad
+--- a/GUI/Timeline.hs
++++ b/GUI/Timeline.hs
+@@ -34,7 +34,7 @@
+ import Events.HECs
+ 
+ import Graphics.UI.Gtk
+-import Graphics.Rendering.Cairo
++import Graphics.Rendering.Cairo hiding (height)
+ 
+ import Data.IORef
+ import Control.Monad
+--- a/GUI/SaveAs.hs
++++ b/GUI/SaveAs.hs
+@@ -9,7 +9,7 @@
+ 
+ -- Imports for GTK
+ import Graphics.UI.Gtk
+-import Graphics.Rendering.Cairo
++import Graphics.Rendering.Cairo hiding (height)
+ 
+ saveAs :: HECs -> ViewParameters -> Double -> DrawingArea
+        -> (Int, Int, Render ())
diff -rN -u old-threadscope/patches/series new-threadscope/patches/series
--- old-threadscope/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-threadscope/patches/series	2014-05-20 22:00:33.701568999 +0000
@@ -0,0 +1 @@
+ambigiouty-cairo-types.patch