r13785 - packages/trunk/nikki/debian/patches

[Paul Wise]

Author: pabs
Date: 2012-09-19 02:02:10 +0000 (Wed, 19 Sep 2012)
New Revision: 13785

Removed:
   packages/trunk/nikki/debian/patches/fix-typo.patch
Modified:
   packages/trunk/nikki/debian/patches/No-FindBin-Dependency
   packages/trunk/nikki/debian/patches/series
Log:
Update patches

Modified: packages/trunk/nikki/debian/patches/No-FindBin-Dependency
===================================================================
--- packages/trunk/nikki/debian/patches/No-FindBin-Dependency	2012-09-19 01:49:21 UTC (rev 13784)
+++ packages/trunk/nikki/debian/patches/No-FindBin-Dependency	2012-09-19 02:02:10 UTC (rev 13785)
@@ -2,12 +2,10 @@
  Paths in Debian are known in advance. Hard-Code that here.
 Author: Joachim Breitner <nomeata at debian.org>
 Forwarded: not-needed
-Last-Updated: 2011-10-26
+Last-Updated: 2012-09-19
 
-Index: nikki-0.5.1.1/src/System/Environment/FindBin.hs
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nikki-0.5.1.1/src/System/Environment/FindBin.hs	2012-08-05 16:04:33.000000000 +0200
+--- /dev/null
++++ b/src/System/Environment/FindBin.hs
 @@ -0,0 +1,9 @@
 +-- | Dummy module to get rid of FindBin dependency
 +module System.Environment.FindBin where
@@ -18,15 +16,13 @@
 +getProgPath :: IO String
 +getProgPath = return __Bin__
 +
-Index: nikki-0.5.1.1/src/rootInstall/nikki.cabal
-===================================================================
---- nikki-0.5.1.1.orig/src/rootInstall/nikki.cabal	2012-08-01 16:26:10.000000000 +0200
-+++ nikki-0.5.1.1/src/rootInstall/nikki.cabal	2012-08-05 16:04:33.000000000 +0200
-@@ -122,7 +122,6 @@
-         , transformers == 0.2.* || == 0.3.*
-         , time
-         , parsec == 3.*
+--- a/src/rootInstall/nikki.cabal
++++ b/src/rootInstall/nikki.cabal
+@@ -133,7 +133,6 @@
+         , directory
+         , email-validate
+         , filepath
 -        , FindBin >= 0.0.5
-         , clocked == 0.4.1.*
-         , cmdargs >= 0.6.6
-         , MonadCatchIO-transformers >= 0.2.2.2
+         , hashable == 1.1.*
+         , Hipmunk >= 5.2.0.6
+         , HTTP == 4000.2.*

Deleted: packages/trunk/nikki/debian/patches/fix-typo.patch
===================================================================
--- packages/trunk/nikki/debian/patches/fix-typo.patch	2012-09-19 01:49:21 UTC (rev 13784)
+++ packages/trunk/nikki/debian/patches/fix-typo.patch	2012-09-19 02:02:10 UTC (rev 13785)
@@ -1,14 +0,0 @@
-Description: fix a typo in part of the code
-Author: Paul Wise <pabs at debian.org>
-
---- a/src/LevelServer/Configuration.hs
-+++ b/src/LevelServer/Configuration.hs
-@@ -17,7 +17,7 @@ levelServerPort = case showVersion (prot
-     "0.1" -> 8143
-     "0.2" -> 8144
-     "0.3" -> 8145
--    x -> error ("unkown version: " ++ x)
-+    x -> error ("unknown version: " ++ x)
- 
- levelServerLicenseUrl :: String
- levelServerLicenseUrl = "http://creativecommons.org/licenses/by/3.0/"

Modified: packages/trunk/nikki/debian/patches/series
===================================================================
--- packages/trunk/nikki/debian/patches/series	2012-09-19 01:49:21 UTC (rev 13784)
+++ packages/trunk/nikki/debian/patches/series	2012-09-19 02:02:10 UTC (rev 13785)
@@ -1,2 +1 @@
 No-FindBin-Dependency
-fix-typo.patch