r13753 - packages/trunk/nikki/debian/patches

[Joachim Breitner]

Author: nomeata
Date: 2012-08-05 14:07:41 +0000 (Sun, 05 Aug 2012)
New Revision: 13753

Removed:
   packages/trunk/nikki/debian/patches/libzip-compat
   packages/trunk/nikki/debian/patches/relax-dependencies
Modified:
   packages/trunk/nikki/debian/patches/No-FindBin-Dependency
   packages/trunk/nikki/debian/patches/series
Log:
Refresh patches

Modified: packages/trunk/nikki/debian/patches/No-FindBin-Dependency
===================================================================
--- packages/trunk/nikki/debian/patches/No-FindBin-Dependency	2012-08-05 13:52:30 UTC (rev 13752)
+++ packages/trunk/nikki/debian/patches/No-FindBin-Dependency	2012-08-05 14:07:41 UTC (rev 13753)
@@ -4,8 +4,10 @@
 Forwarded: not-needed
 Last-Updated: 2011-10-26
 
---- /dev/null
-+++ b/src/System/Environment/FindBin.hs
+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
 @@ -0,0 +1,9 @@
 +-- | Dummy module to get rid of FindBin dependency
 +module System.Environment.FindBin where
@@ -16,10 +18,12 @@
 +getProgPath :: IO String
 +getProgPath = return __Bin__
 +
---- a/src/rootInstall/nikki.cabal
-+++ b/src/rootInstall/nikki.cabal
+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
+         , transformers == 0.2.* || == 0.3.*
          , time
          , parsec == 3.*
 -        , FindBin >= 0.0.5

Deleted: packages/trunk/nikki/debian/patches/libzip-compat
===================================================================
--- packages/trunk/nikki/debian/patches/libzip-compat	2012-08-05 13:52:30 UTC (rev 13752)
+++ packages/trunk/nikki/debian/patches/libzip-compat	2012-08-05 14:07:41 UTC (rev 13753)
@@ -1,14 +0,0 @@
-Description: Adjust types to match latest libzip code
-Author: Joachim Breitner <nomeata at debian.org>
-
---- nikki-0.5.0.1.orig/src/Distribution/AutoUpdate/Zip.hs
-+++ nikki-0.5.0.1/src/Distribution/AutoUpdate/Zip.hs
-@@ -18,7 +18,7 @@ import Utils
- 
- 
- -- | chunk size while unzipping
--chunkSize :: Int
-+chunkSize :: Integer
- chunkSize = 1024
- 
- -- | unzips a given archive into a given directory

Deleted: packages/trunk/nikki/debian/patches/relax-dependencies
===================================================================
--- packages/trunk/nikki/debian/patches/relax-dependencies	2012-08-05 13:52:30 UTC (rev 13752)
+++ packages/trunk/nikki/debian/patches/relax-dependencies	2012-08-05 14:07:41 UTC (rev 13753)
@@ -1,22 +0,0 @@
-Description: Extend dependencies as needed
-Author: Joachim Breitner <nomeata at debian.org>
-
---- nikki-0.5.0.1.orig/src/rootInstall/nikki.cabal
-+++ nikki-0.5.0.1/src/rootInstall/nikki.cabal
-@@ -128,14 +128,14 @@ Executable nikki
-         , download-curl >= 0.1.3
-         , temporary >= 1.1.1
-         , bytestring >= 0.9.1.7
--        , LibZip == 0.2.*
-+        , LibZip >= 0.2
-         , uniplate >= 1.6
-         , data-accessor >= 0.2.1.7
-         , data-accessor-mtl >= 0.2.0.2
-         , strict >= 0.3.2
-         , vector >= 0.9
-         , RSA == 1.*
--        , aeson == 0.4.*
-+        , aeson >= 0.4
-         , attoparsec == 0.9.* || == 0.10.*
-         , network == 2.*
-         , binary-communicator >= 1.0.2

Modified: packages/trunk/nikki/debian/patches/series
===================================================================
--- packages/trunk/nikki/debian/patches/series	2012-08-05 13:52:30 UTC (rev 13752)
+++ packages/trunk/nikki/debian/patches/series	2012-08-05 14:07:41 UTC (rev 13753)
@@ -1,3 +1 @@
 No-FindBin-Dependency
-relax-dependencies
-libzip-compat