[DHG_packages] 01/01: zeromq4-haskell: rename alignment to zmqalignment

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit c6659bac969d57a8233edc763b3d5e90d4829534
Author: Clint Adams <clint at debian.org>
Date:   Fri Nov 11 22:39:01 2016 -0500

    zeromq4-haskell: rename alignment to zmqalignment
---
 p/haskell-zeromq4-haskell/debian/changelog         |  6 ++++
 .../debian/patches/rename-alignment                | 38 ++++++++++++++++++++++
 p/haskell-zeromq4-haskell/debian/patches/series    |  1 +
 3 files changed, 45 insertions(+)

diff --git a/p/haskell-zeromq4-haskell/debian/changelog b/p/haskell-zeromq4-haskell/debian/changelog
index 0390f43..1910b2b 100644
--- a/p/haskell-zeromq4-haskell/debian/changelog
+++ b/p/haskell-zeromq4-haskell/debian/changelog
@@ -1,3 +1,9 @@
+haskell-zeromq4-haskell (0.6.5-4) unstable; urgency=medium
+
+  * Rename alignment definition to not conflict with hsc2hs's.
+
+ -- Clint Adams <clint at debian.org>  Fri, 11 Nov 2016 22:34:02 -0500
+
 haskell-zeromq4-haskell (0.6.5-3) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-zeromq4-haskell/debian/patches/rename-alignment b/p/haskell-zeromq4-haskell/debian/patches/rename-alignment
new file mode 100644
index 0000000..a393ab4
--- /dev/null
+++ b/p/haskell-zeromq4-haskell/debian/patches/rename-alignment
@@ -0,0 +1,38 @@
+--- a/src/System/ZMQ4/Internal/Base.hsc
++++ b/src/System/ZMQ4/Internal/Base.hsc
+@@ -26,7 +26,7 @@
+   } deriving (Eq, Ord)
+ 
+ instance Storable ZMQMsg where
+-    alignment _        = #{alignment zmq_msg_t}
++    alignment _        = #{zmqalignment zmq_msg_t}
+     sizeOf    _        = #{size zmq_msg_t}
+     peek p             = ZMQMsg <$> #{peek zmq_msg_t, _} p
+     poke p (ZMQMsg c)  = #{poke zmq_msg_t, _} p c
+@@ -42,7 +42,7 @@
+     }
+ 
+ instance Storable ZMQPoll where
+-    alignment _ = #{alignment zmq_pollitem_t}
++    alignment _ = #{zmqalignment zmq_pollitem_t}
+     sizeOf    _ = #{size zmq_pollitem_t}
+     peek p = do
+         s  <- #{peek zmq_pollitem_t, socket} p
+@@ -61,7 +61,7 @@
+ type ZMQSocket  = Ptr ()
+ type ZMQPollPtr = Ptr ZMQPoll
+ 
+-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
++#let zmqalignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+ 
+ -----------------------------------------------------------------------------
+ -- Socket Types
+@@ -188,7 +188,7 @@
+ 
+ #if ZMQ_VERSION < 40100
+ instance Storable ZMQEvent where
+-    alignment _ = #{alignment zmq_event_t}
++    alignment _ = #{zmqalignment zmq_event_t}
+     sizeOf    _ = #{size zmq_event_t}
+     peek e = ZMQEvent
+         <$> (ZMQEventType <$> #{peek zmq_event_t, event} e)
diff --git a/p/haskell-zeromq4-haskell/debian/patches/series b/p/haskell-zeromq4-haskell/debian/patches/series
new file mode 100644
index 0000000..739074c
--- /dev/null
+++ b/p/haskell-zeromq4-haskell/debian/patches/series
@@ -0,0 +1 @@
+rename-alignment

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