[Pkg-haskell-commits] darcs: lhs2tex: Do not use utf8-string (Closes: #570868)

[Joachim Breitner]

Thu Mar 25 17:59:50 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Do not use utf8-string (Closes: #570868) 
  Ignore-this: f8f481bcf515165e416d59a2e287d1d4

    M ./changelog +1
    M ./control -1
    A ./patches/no-utf8-string.patch
    M ./patches/series +1

Thu Mar 25 17:59:50 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Do not use utf8-string (Closes: #570868) 
  Ignore-this: f8f481bcf515165e416d59a2e287d1d4
diff -rN -u old-lhs2tex/changelog new-lhs2tex/changelog
--- old-lhs2tex/changelog	2010-03-25 18:03:04.309639328 +0000
+++ new-lhs2tex/changelog	2010-03-25 18:03:04.321639979 +0000
@@ -6,6 +6,7 @@
   * Use dh_prep instead of dh_clean -k
   * No more bashism (Closes: #530115)
   * Builds fine with ghc-6.12 (Closes: #574794)
+  * Do not use utf8-string (Closes: #570868) 
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 25 Mar 2010 12:06:24 +0100
 
diff -rN -u old-lhs2tex/control new-lhs2tex/control
--- old-lhs2tex/control	2010-03-25 18:03:04.309639328 +0000
+++ new-lhs2tex/control	2010-03-25 18:03:04.317639762 +0000
@@ -8,7 +8,6 @@
  debhelper (>= 7),
  ghc6 (>= 6.12),
  libghc6-regex-compat-dev,
- libghc6-utf8-string-dev,
  tex-common 
 Standards-Version: 3.8.4
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/lhs2tex
diff -rN -u old-lhs2tex/patches/no-utf8-string.patch new-lhs2tex/patches/no-utf8-string.patch
--- old-lhs2tex/patches/no-utf8-string.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-lhs2tex/patches/no-utf8-string.patch	2010-03-25 18:03:04.313639545 +0000
@@ -0,0 +1,37 @@
+Description: Do not use ut8f-string
+--- lhs2tex-1.15.orig/FileNameUtils.lhs
++++ lhs2tex-1.15/FileNameUtils.lhs
+@@ -11,8 +11,7 @@
+ >                               ) where
+ >
+ > import Prelude hiding         (  catch, readFile )
+-> import System.IO              (  openFile, IOMode(..) )
+-> import System.IO.UTF8
++> import System.IO              (  openFile, IOMode(..), hGetContents )
+ > import System.Directory
+ > import System.Environment
+ > import Data.List
+--- lhs2tex-1.15.orig/lhs2tex.cabal
++++ lhs2tex-1.15/lhs2tex.cabal
+@@ -18,7 +18,7 @@ flag splitBase
+ executable lhs2TeX
+   main-is:	Main.lhs
+   if flag(splitBase)
+-    build-depends:	base >= 3 && < 5, regex-compat, mtl, filepath, directory, process, utf8-string, extensible-exceptions
++    build-depends:	base >= 3 && < 5, regex-compat, mtl, filepath, directory, process, extensible-exceptions
+   else
+-    build-depends:	base < 3, regex-compat, mtl, filepath, utf8-string
++    build-depends:	base < 3, regex-compat, mtl, filepath
+ 
+--- lhs2tex-1.15.orig/Main.lhs
++++ lhs2tex-1.15/Main.lhs
+@@ -9,8 +9,7 @@
+ >
+ > import Data.Char ( isSpace )
+ > import Data.List ( isPrefixOf )
+-> import System.IO ( hClose, hFlush, stderr, stdout, openFile, IOMode(..), Handle(..) )
+-> import System.IO.UTF8 ( hPutStr, hPutStrLn, hGetLine, getContents )
++> import System.IO 
+ > import System.Directory ( copyFile )
+ > import System.Console.GetOpt
+ > import Text.Regex ( matchRegex, mkRegexWithOpts )
diff -rN -u old-lhs2tex/patches/series new-lhs2tex/patches/series
--- old-lhs2tex/patches/series	2010-03-25 18:03:04.309639328 +0000
+++ new-lhs2tex/patches/series	2010-03-25 18:03:04.313639545 +0000
@@ -1,2 +1,3 @@
 01_always_install_polytable.patch
 10_fix_bashims.patch
+no-utf8-string.patch