[med-svn] [phybin] 04/05: DEP3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository phybin.

commit f5ec68f168db4d7dcc4bf27b4679565413acc735
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 18 17:28:42 2015 +0100

    DEP3
---
 debian/patches/series                                    |  4 ++--
 ...ext-dependency => unconstraint-text-dependency.patch} | 16 +++++++++-------
 debian/patches/unsafeIOToST                              | 12 ------------
 debian/patches/unsafeIOToST.patch                        | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 96c95ab..370b7d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-unconstraint-text-dependency
-unsafeIOToST
+unconstraint-text-dependency.patch
+unsafeIOToST.patch
diff --git a/debian/patches/unconstraint-text-dependency b/debian/patches/unconstraint-text-dependency.patch
similarity index 77%
rename from debian/patches/unconstraint-text-dependency
rename to debian/patches/unconstraint-text-dependency.patch
index d7a343c..e75c79a 100644
--- a/debian/patches/unconstraint-text-dependency
+++ b/debian/patches/unconstraint-text-dependency.patch
@@ -1,8 +1,10 @@
-Index: phybin/phybin.cabal
-===================================================================
---- phybin.orig/phybin.cabal	2015-12-18 12:49:02.114628092 +0100
-+++ phybin/phybin.cabal	2015-12-18 12:53:51.564825322 +0100
-@@ -75,7 +75,7 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Upate:   Fri Dec 18 09:25:03 2015 +0100
+Description: allow later libghc-text versions
+
+--- a/phybin.cabal
++++ b/phybin.cabal
+@@ -75,7 +75,7 @@ Library
                       async, time,
                       filepath, 
                       graphviz >= 2999.16, 
@@ -11,7 +13,7 @@ Index: phybin/phybin.cabal
                       prettyclass, fgl,
                       HUnit, bytestring, 
                       -- For bytestring.lazy support:
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@ Executable phybin
                       async, time,
                       filepath, 
                       graphviz >= 2999.16, 
@@ -20,7 +22,7 @@ Index: phybin/phybin.cabal
                       prettyclass, fgl,
                       HUnit, bytestring, 
                       -- For bytestring.lazy support:
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ Test-Suite test-phybin
                       async, time,
                       filepath, 
                       graphviz >= 2999.16, 
diff --git a/debian/patches/unsafeIOToST b/debian/patches/unsafeIOToST
deleted file mode 100644
index c63920f..0000000
--- a/debian/patches/unsafeIOToST
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: phybin/Bio/Phylogeny/PhyBin/RFDistance.hs
-===================================================================
---- phybin.orig/Bio/Phylogeny/PhyBin/RFDistance.hs	2015-12-18 12:49:02.114628092 +0100
-+++ phybin/Bio/Phylogeny/PhyBin/RFDistance.hs	2015-12-18 13:01:08.226156255 +0100
-@@ -22,6 +22,7 @@
- 
- import           Control.Monad
- import           Control.Monad.ST
-+import           Control.Monad.ST.Unsafe
- import           Data.Function       (on)
- import           Data.Word
- import qualified Data.Vector                 as V
diff --git a/debian/patches/unsafeIOToST.patch b/debian/patches/unsafeIOToST.patch
new file mode 100644
index 0000000..0580fed
--- /dev/null
+++ b/debian/patches/unsafeIOToST.patch
@@ -0,0 +1,14 @@
+Author: Joachim Breitner <mail at joachim-breitner.de>
+Last-Update: Fri Dec 18 13:03:03 2015 +0100
+Description: Add missing import to solve build issue
+
+--- a/Bio/Phylogeny/PhyBin/RFDistance.hs
++++ b/Bio/Phylogeny/PhyBin/RFDistance.hs
+@@ -22,6 +22,7 @@ module Bio.Phylogeny.PhyBin.RFDistance
+ 
+ import           Control.Monad
+ import           Control.Monad.ST
++import           Control.Monad.ST.Unsafe
+ import           Data.Function       (on)
+ import           Data.Word
+ import qualified Data.Vector                 as V

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/phybin.git