[DHG_packages] 02/02: darcs: New upstream release

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to annotated tag darcs_v2.10.2-1
in repository DHG_packages.

commit 718a2765dad3a87eb10e449ec30763aaf1e7a8f1
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Jan 15 14:57:34 2016 +0100

    darcs: New upstream release
---
 p/darcs/debian/changelog                 |  3 ++-
 p/darcs/debian/control                   |  4 +--
 p/darcs/debian/patches/Num-constraint    | 42 --------------------------------
 p/darcs/debian/patches/allow-vector-0.11 |  6 ++---
 p/darcs/debian/patches/series            |  1 -
 5 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog
index 4137b97..8391865 100644
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -1,5 +1,6 @@
-darcs (2.10.1-8) UNRELEASED; urgency=medium
+darcs (2.10.2-1) unstable; urgency=medium
 
+  * New upstream release
   * Patch to allow vector 0.11 (Closes: 811066)
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 15 Jan 2016 14:56:01 +0100
diff --git a/p/darcs/debian/control b/p/darcs/debian/control
index b940e67..477cc4e 100644
--- a/p/darcs/debian/control
+++ b/p/darcs/debian/control
@@ -48,8 +48,8 @@ Build-Depends: cdbs,
  libghc-mmap-dev (<< 0.6),
  libghc-zlib-dev (>= 0.5.3.0),
  libghc-zlib-dev (<< 0.7.0.0),
- libghc-dataenc-dev (>= 0.11),
- libghc-dataenc-dev (<< 0.15),
+ libghc-sandi-dev (>= 0.2),
+ libghc-sandi-dev (<< 0.4),
  libghc-unix-compat-dev (>= 0.1.2),
  libghc-unix-compat-dev (<< 0.5),
 Standards-Version: 3.9.6
diff --git a/p/darcs/debian/patches/Num-constraint b/p/darcs/debian/patches/Num-constraint
deleted file mode 100644
index 5245fee..0000000
--- a/p/darcs/debian/patches/Num-constraint
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: darcs/hashed-storage/Storage/Hashed/Utils.hs
-===================================================================
---- darcs.orig/hashed-storage/Storage/Hashed/Utils.hs	2015-07-09 18:48:56.000000000 +0200
-+++ darcs/hashed-storage/Storage/Hashed/Utils.hs	2015-07-15 20:05:09.425950430 +0200
-@@ -91,8 +91,8 @@
-                      x -> i + boundary - x
- {-# INLINE align #-}
- 
--xlate32 :: (Bits a) => a -> a
--xlate64 :: (Bits a) => a -> a
-+xlate32 :: (Num a, Bits a) => a -> a
-+xlate64 :: (Num a, Bits a) => a -> a
- 
- #ifdef LITTLEENDIAN
- xlate32 = id
-@@ -100,7 +100,7 @@
- #endif
- 
- #ifdef BIGENDIAN
--bytemask :: (Bits a) => a
-+bytemask :: (Num a, Bits a) => a
- bytemask = 255
- 
- xlate32 a = ((a .&. (bytemask `shift`  0)) `shiftL` 24) .|.
-Index: darcs/hashed-storage/Storage/Hashed/Index.hs
-===================================================================
---- darcs.orig/hashed-storage/Storage/Hashed/Index.hs	2015-07-09 18:48:56.000000000 +0200
-+++ darcs/hashed-storage/Storage/Hashed/Index.hs	2015-07-15 20:05:52.470960853 +0200
-@@ -166,11 +166,11 @@
- itemIsDir i = unsafeHead (iDescriptor i) == c2w 'D'
- 
- -- xlatePeek32 = fmap xlate32 . peek
--xlatePeek64 :: (Storable a, Bits a) => Ptr a -> IO a
-+xlatePeek64 :: (Storable a, Num a, Bits a) => Ptr a -> IO a
- xlatePeek64 = fmap xlate64 . peek
- 
- -- xlatePoke32 ptr v = poke ptr (xlate32 v)
--xlatePoke64 :: (Storable a, Bits a) => Ptr a -> a -> IO ()
-+xlatePoke64 :: (Storable a, Num a, Bits a) => Ptr a -> a -> IO ()
- xlatePoke64 ptr v = poke ptr (xlate64 v)
- 
- -- | Lay out the basic index item structure in memory. The memory location is
diff --git a/p/darcs/debian/patches/allow-vector-0.11 b/p/darcs/debian/patches/allow-vector-0.11
index 88bba5a..89a45cf 100644
--- a/p/darcs/debian/patches/allow-vector-0.11
+++ b/p/darcs/debian/patches/allow-vector-0.11
@@ -1,8 +1,8 @@
 Index: darcs/darcs.cabal
 ===================================================================
---- darcs.orig/darcs.cabal	2016-01-15 14:56:27.787336523 +0100
-+++ darcs/darcs.cabal	2016-01-15 14:56:38.843569838 +0100
-@@ -437,7 +437,7 @@
+--- darcs.orig/darcs.cabal	2016-01-15 14:58:02.313330633 +0100
++++ darcs/darcs.cabal	2016-01-15 14:58:02.313330633 +0100
+@@ -438,7 +438,7 @@
                       cryptohash   >= 0.4 && < 0.12,
                       base16-bytestring >= 0.1 && < 0.2,
                       utf8-string >= 0.3.6 && < 1.1,
diff --git a/p/darcs/debian/patches/series b/p/darcs/debian/patches/series
index 9577d57..b099de7 100644
--- a/p/darcs/debian/patches/series
+++ b/p/darcs/debian/patches/series
@@ -1,4 +1,3 @@
 use-sensible-editor
 avoid-TH-in-Setup
-Num-constraint
 allow-vector-0.11

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git