r13448 - in packages/trunk/raincat/debian: . patches

[Vincent Legout]

Author: vlegout
Date: 2012-04-01 08:47:43 +0000 (Sun, 01 Apr 2012)
New Revision: 13448

Added:
   packages/trunk/raincat/debian/patches/fix_haskell_modules.patch
Modified:
   packages/trunk/raincat/debian/changelog
   packages/trunk/raincat/debian/patches/series
Log:
Add fix_haskell_modules.patch to fix ftbfs

Modified: packages/trunk/raincat/debian/changelog
===================================================================
--- packages/trunk/raincat/debian/changelog	2012-03-31 10:14:55 UTC (rev 13447)
+++ packages/trunk/raincat/debian/changelog	2012-04-01 08:47:43 UTC (rev 13448)
@@ -1,3 +1,10 @@
+raincat (1.1-3) unstable; urgency=low
+
+  * Team upload.
+  * Add debian/patches/fix_haskell_modules.patch (Closes: #665069)
+
+ -- Vincent Legout <vlegout at debian.org>  Sun, 01 Apr 2012 10:10:51 +0200
+
 raincat (1.1-2) unstable; urgency=low
 
   [ Paul Wise ]

Added: packages/trunk/raincat/debian/patches/fix_haskell_modules.patch
===================================================================
--- packages/trunk/raincat/debian/patches/fix_haskell_modules.patch	                        (rev 0)
+++ packages/trunk/raincat/debian/patches/fix_haskell_modules.patch	2012-04-01 08:47:43 UTC (rev 13448)
@@ -0,0 +1,111 @@
+Description: Update module imports, fix ftbfs
+Author: Vincent Legout <vlegout at debian.org>
+Last-Update: 2012-04-01
+Bug-Debian: http://bugs.debian.org/665069
+
+Index: raincat-1.1/src/Cat/Cat.hs
+===================================================================
+--- raincat-1.1.orig/src/Cat/Cat.hs	2010-01-28 19:31:39.000000000 +0100
++++ raincat-1.1/src/Cat/Cat.hs	2012-04-01 10:14:33.572911584 +0200
+@@ -30,7 +30,7 @@
+      updateCatAnim,
+      updateCatItemDuration) where
+ 
+-import Maybe
++import Data.Maybe
+ import Graphics.Rendering.OpenGL as GL
+ import Nxt.Graphics
+ import Nxt.Types
+Index: raincat-1.1/src/Game/GameInit.hs
+===================================================================
+--- raincat-1.1.orig/src/Game/GameInit.hs	2010-01-28 19:31:39.000000000 +0100
++++ raincat-1.1/src/Game/GameInit.hs	2012-04-01 10:14:33.572911584 +0200
+@@ -1,7 +1,7 @@
+ module Game.GameInit
+     (gameInit) where
+ 
+-import Maybe
++import Data.Maybe
+ import Data.IORef
+ import World.World
+ import qualified Nxt.Graphics
+Index: raincat-1.1/src/Game/GameMain.hs
+===================================================================
+--- raincat-1.1.orig/src/Game/GameMain.hs	2010-01-28 19:31:39.000000000 +0100
++++ raincat-1.1/src/Game/GameMain.hs	2012-04-01 10:14:33.580911584 +0200
+@@ -1,8 +1,8 @@
+ module Game.GameMain
+     (gameMain) where
+ 
+-import List
+-import Maybe
++import Data.List
++import Data.Maybe
+ import Control.Monad.State
+ import Data.IORef
+ import qualified Graphics.UI.GLUT as Glut
+Index: raincat-1.1/src/Items/ItemEffects.hs
+===================================================================
+--- raincat-1.1.orig/src/Items/ItemEffects.hs	2010-01-28 19:31:38.000000000 +0100
++++ raincat-1.1/src/Items/ItemEffects.hs	2012-04-01 10:14:33.600911583 +0200
+@@ -18,7 +18,7 @@
+      pogostickEffect2,
+      wrenchEffect) where
+ 
+-import Maybe
++import Data.Maybe
+ import Graphics.Rendering.OpenGL as GL
+ import Nxt.Graphics
+ import Nxt.Types
+Index: raincat-1.1/src/Items/Items.hs
+===================================================================
+--- raincat-1.1.orig/src/Items/Items.hs	2010-01-28 19:31:38.000000000 +0100
++++ raincat-1.1/src/Items/Items.hs	2012-04-01 10:14:33.600911583 +0200
+@@ -17,7 +17,7 @@
+      drawItemBut,
+      mouseOverItemBut) where
+ 
+-import Maybe
++import Data.Maybe
+ import Graphics.Rendering.OpenGL as GL
+ import Nxt.Graphics
+ import Nxt.Types
+Index: raincat-1.1/src/Level/Level.hs
+===================================================================
+--- raincat-1.1.orig/src/Level/Level.hs	2010-01-28 19:31:40.000000000 +0100
++++ raincat-1.1/src/Level/Level.hs	2012-04-01 10:14:33.600911583 +0200
+@@ -16,7 +16,7 @@
+      openLevel) where
+ 
+ import Nxt.Types
+-import IO
++import System.IO
+ import Control.Exception
+ import Settings.DisplaySettings
+ import Nxt.Types
+Index: raincat-1.1/src/Menu/PostVictory.hs
+===================================================================
+--- raincat-1.1.orig/src/Menu/PostVictory.hs	2010-01-28 19:31:39.000000000 +0100
++++ raincat-1.1/src/Menu/PostVictory.hs	2012-04-01 10:14:33.600911583 +0200
+@@ -2,7 +2,7 @@
+     (postVictoryMain,
+      postVictoryDraw) where
+ 
+-import Maybe
++import Data.Maybe
+ import Graphics.Rendering.OpenGL as GL hiding (get)
+ import Graphics.UI.GLUT hiding (get)
+ import Data.IORef
+Index: raincat-1.1/src/Rain/Rain.hs
+===================================================================
+--- raincat-1.1.orig/src/Rain/Rain.hs	2010-01-28 19:31:38.000000000 +0100
++++ raincat-1.1/src/Rain/Rain.hs	2012-04-01 10:14:33.600911583 +0200
+@@ -4,7 +4,7 @@
+      rainRect,
+      rainPoly) where
+ 
+-import Random
++import System.Random
+ import Graphics.Rendering.OpenGL
+ import World.World
+ import Panels.MainPanel

Modified: packages/trunk/raincat/debian/patches/series
===================================================================
--- packages/trunk/raincat/debian/patches/series	2012-03-31 10:14:55 UTC (rev 13447)
+++ packages/trunk/raincat/debian/patches/series	2012-04-01 08:47:43 UTC (rev 13448)
@@ -1,2 +1,3 @@
 path.patch
 ftbfs.patch
+fix_haskell_modules.patch