[DHG_packages] 01/01: zeromq4-haskell: delete alignment definition and just use hsc2hs's

[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 7d811e6e177f677657ac5790b75c1529c9f51a0e
Author: Clint Adams <clint at debian.org>
Date:   Fri Nov 11 23:07:09 2016 -0500

    zeromq4-haskell: delete alignment definition and just use hsc2hs's
---
 p/haskell-zeromq4-haskell/debian/changelog         |  6 ++++
 .../debian/patches/delete-alignment                | 11 +++++++
 .../debian/patches/rename-alignment                | 38 ----------------------
 p/haskell-zeromq4-haskell/debian/patches/series    |  2 +-
 4 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/p/haskell-zeromq4-haskell/debian/changelog b/p/haskell-zeromq4-haskell/debian/changelog
index 1910b2b..27bf1e2 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-5) unstable; urgency=medium
+
+  * Delete alignment definition and just use hsc2hs's.
+
+ -- Clint Adams <clint at debian.org>  Fri, 11 Nov 2016 23:06:26 -0500
+
 haskell-zeromq4-haskell (0.6.5-4) unstable; urgency=medium
 
   * Rename alignment definition to not conflict with hsc2hs's.
diff --git a/p/haskell-zeromq4-haskell/debian/patches/delete-alignment b/p/haskell-zeromq4-haskell/debian/patches/delete-alignment
new file mode 100644
index 0000000..c9d7ccb
--- /dev/null
+++ b/p/haskell-zeromq4-haskell/debian/patches/delete-alignment
@@ -0,0 +1,11 @@
+--- a/src/System/ZMQ4/Internal/Base.hsc
++++ b/src/System/ZMQ4/Internal/Base.hsc
+@@ -61,8 +61,6 @@
+ type ZMQSocket  = Ptr ()
+ type ZMQPollPtr = Ptr ZMQPoll
+ 
+-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+-
+ -----------------------------------------------------------------------------
+ -- Socket Types
+ 
diff --git a/p/haskell-zeromq4-haskell/debian/patches/rename-alignment b/p/haskell-zeromq4-haskell/debian/patches/rename-alignment
deleted file mode 100644
index a393ab4..0000000
--- a/p/haskell-zeromq4-haskell/debian/patches/rename-alignment
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
index 739074c..7dca6c6 100644
--- a/p/haskell-zeromq4-haskell/debian/patches/series
+++ b/p/haskell-zeromq4-haskell/debian/patches/series
@@ -1 +1 @@
-rename-alignment
+delete-alignment

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