r13414 - in packages/trunk/nikki/debian: . patches

[Joachim Breitner]

Author: nomeata
Date: 2012-03-20 21:23:50 +0000 (Tue, 20 Mar 2012)
New Revision: 13414

Added:
   packages/trunk/nikki/debian/patches/libzip-compat
   packages/trunk/nikki/debian/patches/relax-dependencies
Modified:
   packages/trunk/nikki/debian/
   packages/trunk/nikki/debian/control
   packages/trunk/nikki/debian/patches/series
Log:
Two patches to make it compile


Property changes on: packages/trunk/nikki/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/nikki_0.4.1.2+darcs91.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/nikki_0.5.0.1.orig.tar.gz


Modified: packages/trunk/nikki/debian/control
===================================================================
--- packages/trunk/nikki/debian/control	2012-03-20 15:14:02 UTC (rev 13413)
+++ packages/trunk/nikki/debian/control	2012-03-20 21:23:50 UTC (rev 13414)
@@ -10,7 +10,7 @@
  debhelper (>= 9),
  ghc,
  imagemagick,
- libghc-aeson-dev (<< 0.5),
+ libghc-aeson-dev (<< 0.7),
  libghc-aeson-dev (>= 0.4),
  libghc-attoparsec-dev (<< 0.11),
  libghc-attoparsec-dev (>= 0.9),
@@ -22,12 +22,10 @@
  libghc-cmdargs-dev (>= 0.6.6),
  libghc-data-accessor-dev (>= 0.2.1.7),
  libghc-data-accessor-mtl-dev (>= 0.2.0.2),
- libghc-deepseq-dev (<< 1.4),
- libghc-deepseq-dev (>= 1.3),
  libghc-download-curl-dev (>= 0.1.3),
  libghc-email-validate-dev,
  libghc-hipmunk-dev (>= 5.2.0.6),
- libghc-libzip-dev (<< 0.3),
+ libghc-libzip-dev (<< 0.11),
  libghc-libzip-dev (>= 0.2),
  libghc-monadcatchio-transformers-dev (>= 0.2.2.2),
  libghc-mtl-dev (<< 3),

Added: packages/trunk/nikki/debian/patches/libzip-compat
===================================================================
--- packages/trunk/nikki/debian/patches/libzip-compat	                        (rev 0)
+++ packages/trunk/nikki/debian/patches/libzip-compat	2012-03-20 21:23:50 UTC (rev 13414)
@@ -0,0 +1,14 @@
+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

Added: packages/trunk/nikki/debian/patches/relax-dependencies
===================================================================
--- packages/trunk/nikki/debian/patches/relax-dependencies	                        (rev 0)
+++ packages/trunk/nikki/debian/patches/relax-dependencies	2012-03-20 21:23:50 UTC (rev 13414)
@@ -0,0 +1,22 @@
+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-03-20 15:14:02 UTC (rev 13413)
+++ packages/trunk/nikki/debian/patches/series	2012-03-20 21:23:50 UTC (rev 13414)
@@ -1 +1,3 @@
 No-FindBin-Dependency
+relax-dependencies
+libzip-compat