Author: tille Date: 2012-03-20 12:57:28 +0000 (Tue, 20 Mar 2012) New Revision: 10028
Added: trunk/packages/qiime/trunk/debian/patches/ghc_7.4.2_compatibility.patch Removed: trunk/packages/qiime/trunk/debian/patches/fix_system_exit.patch Modified: trunk/packages/qiime/trunk/debian/changelog trunk/packages/qiime/trunk/debian/patches/series Log: Replace old fix_system_exit.patch by ghc_7.4.2_compatibility.patch provided by Joachim Breitner which finally solves the build problem Modified: trunk/packages/qiime/trunk/debian/changelog =================================================================== --- trunk/packages/qiime/trunk/debian/changelog 2012-03-20 12:47:20 UTC (rev 10027) +++ trunk/packages/qiime/trunk/debian/changelog 2012-03-20 12:57:28 UTC (rev 10028) @@ -5,12 +5,10 @@ [ Andreas Tille ] * Standards-Version: 3.9.3 (no changes needed) - * debian/patches/fix_system_exit.patch: Fix build problem based - on illegal use of 'import System' (Thanks to Tim Booth - <[email protected]>) for the patch + * debian/patches/ghc_7.4.2_compatibility.patch: Fix build problem based + on illegal use of 'import System' (Thanks to Joachim Breitner + <[email protected]>) for the patch Closes: #663889 - ===> NOT YET SOLVED, I'd like to try using Build-Depends: libghc-unixutils-dev - but this package is not installable -- Andreas Tille <[email protected]> Sat, 17 Mar 2012 19:19:38 +0100 Deleted: trunk/packages/qiime/trunk/debian/patches/fix_system_exit.patch =================================================================== --- trunk/packages/qiime/trunk/debian/patches/fix_system_exit.patch 2012-03-20 12:47:20 UTC (rev 10027) +++ trunk/packages/qiime/trunk/debian/patches/fix_system_exit.patch 2012-03-20 12:57:28 UTC (rev 10028) @@ -1,23 +0,0 @@ -Author: Tim Booth <[email protected]> -Revised: Andreas Tille <[email protected]> -Date: Date: Thu, 15 Mar 2012 15:44:41 +0000 -Bug-Closed: http://bugs.debian.org/663889 -Desciption: Tim's comment about the patch: - It seems that 'import System' was previously legal but wrong, and the - newer version of GHC is enforcing the rule properly. - . - As a guess, based on my very old and rusty knowledge of Haskell and a - quick query of Google. - ---- qiime-1.3.0.orig/qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.lhs -+++ qiime-1.3.0/qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.lhs -@@ -6,8 +6,7 @@ - > import ADPCombinators - > import System(getArgs) - > import System.IO --> import System.Exit(exitWith) --> import System -+> import System.Exit - > import Text.Printf(printf) - - The signature: Added: trunk/packages/qiime/trunk/debian/patches/ghc_7.4.2_compatibility.patch =================================================================== --- trunk/packages/qiime/trunk/debian/patches/ghc_7.4.2_compatibility.patch (rev 0) +++ trunk/packages/qiime/trunk/debian/patches/ghc_7.4.2_compatibility.patch 2012-03-20 12:57:28 UTC (rev 10028) @@ -0,0 +1,48 @@ +Description: GHC 7.4.2 compatibility + This patch changes the module imports so that it works without the haskell2012 + library, which is hidden with GHC 7.4.1 by default. +Author: Joachim Breitner <[email protected]> +Date: Mon, 19 Mar 2012 15:26:02 +0100 +Bug-Debian: http://bugs.debian.org/663889 + +--- qiime-1.3.0.orig/qiime/support_files/denoiser/FlowgramAlignment/FlowgramUtils.lhs ++++ qiime-1.3.0/qiime/support_files/denoiser/FlowgramAlignment/FlowgramUtils.lhs +@@ -1,6 +1,6 @@ + > module FlowgramUtils where + +-> import Array ++> import Data.Array + > import System.IO.Unsafe (unsafePerformIO) + + > type FlowSignalDistrib = Array (Int,Int) Float +--- qiime-1.3.0.orig/qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.lhs ++++ qiime-1.3.0/qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.lhs +@@ -1,13 +1,12 @@ + > module Main where + +-> import Array +-> import List ++> import Data.Array ++> import Data.List + > import FlowgramUtils + > import ADPCombinators +-> import System(getArgs) ++> import System.Environment(getArgs) + > import System.IO +-> import System.Exit(exitWith) +-> import System ++> import System.Exit(exitWith, ExitCode(..)) + > import Text.Printf(printf) + + The signature: +--- qiime-1.3.0.orig/qiime/support_files/denoiser/FlowgramAlignment/ADPCombinators.lhs ++++ qiime-1.3.0/qiime/support_files/denoiser/FlowgramAlignment/ADPCombinators.lhs +@@ -7,7 +7,7 @@ programming. + ---------------------------------------------------------------------- + + > module ADPCombinators where +-> import Array ++> import Data.Array + + Lexical parsers + ---------------- Modified: trunk/packages/qiime/trunk/debian/patches/series =================================================================== --- trunk/packages/qiime/trunk/debian/patches/series 2012-03-20 12:47:20 UTC (rev 10027) +++ trunk/packages/qiime/trunk/debian/patches/series 2012-03-20 12:57:28 UTC (rev 10028) @@ -1,4 +1,4 @@ python26_trim_sff_primers.patch fix_shebang_lines.patch fix_binary_helper_location.patch -fix_system_exit.patch +ghc_7.4.2_compatibility.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
