[Git][haskell-team/DHG_packages][master] hashable: refresh patch

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
3f24adc3 by Clint Adams at 2018-04-12T17:13:12-04:00
hashable: refresh patch

- - - - -


4 changed files:

- p/haskell-hashable/debian/changelog
- + p/haskell-hashable/debian/patches/comma
- p/haskell-hashable/debian/patches/fix-mmap.patch
- p/haskell-hashable/debian/patches/series


Changes:

=====================================
p/haskell-hashable/debian/changelog
=====================================
--- a/p/haskell-hashable/debian/changelog
+++ b/p/haskell-hashable/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hashable (1.2.7.0-2) unstable; urgency=medium
+
+  * Refresh patch, add a comma.
+
+ -- Clint Adams <clint at debian.org>  Thu, 12 Apr 2018 17:13:00 -0400
+
 haskell-hashable (1.2.7.0-1) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-hashable/debian/patches/comma
=====================================
--- /dev/null
+++ b/p/haskell-hashable/debian/patches/comma
@@ -0,0 +1,11 @@
+--- a/hashable.cabal
++++ b/hashable.cabal
+@@ -79,7 +79,7 @@
+   Type:              exitcode-stdio-1.0
+   Hs-source-dirs:    tests
+   Main-is:           Main.hs
+-  Other-modules:     Properties Regress
++  Other-modules:     Properties, Regress
+   Build-depends:     base >= 4.0 && < 5.0,
+                      bytestring,
+                      ghc-prim,


=====================================
p/haskell-hashable/debian/patches/fix-mmap.patch
=====================================
--- a/p/haskell-hashable/debian/patches/fix-mmap.patch
+++ b/p/haskell-hashable/debian/patches/fix-mmap.patch
@@ -5,8 +5,6 @@ Author: Colin Watson <cjwatson at debian.org>
 Forwarded: https://github.com/tibbe/hashable/pull/96
 Last-Update: 2015-05-09
 
-Index: b/cbits/mmap.c
-===================================================================
 --- /dev/null
 +++ b/cbits/mmap.c
 @@ -0,0 +1,40 @@
@@ -50,28 +48,24 @@ Index: b/cbits/mmap.c
 +{
 +  return mmap(addr, length, prot, flags, fd, offset);
 +}
-Index: b/hashable.cabal
-===================================================================
 --- a/hashable.cabal
 +++ b/hashable.cabal
-@@ -82,6 +82,7 @@
+@@ -94,6 +94,7 @@
    if !os(windows)
      Build-depends:   unix
      CPP-options:     -DHAVE_MMAP
 +    C-sources:       cbits/mmap.c
      Other-modules:   Regress.Mmap
-
+ 
    Ghc-options:       -Wall -fno-warn-orphans
-Index: b/tests/Regress/Mmap.hsc
-===================================================================
 --- a/tests/Regress/Mmap.hsc
 +++ b/tests/Regress/Mmap.hsc
 @@ -60,7 +60,7 @@
  mprotect addr len prot =
      throwErrnoIfMinus1_ "mprotect" $ c_mprotect addr len prot
-
+ 
 -foreign import ccall unsafe "sys/mman.h mmap"
 +foreign import ccall unsafe "hashable_mmap"
      c_mmap :: Ptr a -> CSize -> CInt -> CInt -> CInt -> COff -> IO (Ptr a)
-
+ 
  foreign import ccall unsafe "sys/mman.h munmap"


=====================================
p/haskell-hashable/debian/patches/series
=====================================
--- a/p/haskell-hashable/debian/patches/series
+++ b/p/haskell-hashable/debian/patches/series
@@ -1 +1,2 @@
 fix-mmap.patch
+comma



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/3f24adc39553eb133f40d53be610fb17301c651c

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/3f24adc39553eb133f40d53be610fb17301c651c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20180412/66714392/attachment-0001.html>