[Pkg-haskell-commits] darcs: shelltestrunner: Add patch for UTF-8 and GHC 7.4 changes

Iustin Pop iustin at debian.org
Sat May 19 19:16:02 UTC 2012


Sat May 19 18:53:33 UTC 2012  Iustin Pop <iustin at debian.org>
  * Add patch for UTF-8 and GHC 7.4 changes
  Ignore-this: 982f1c9088e37dcf704ba7018360ccb2

    M ./control -1 +1
    A ./patches/fix-utf8-ghc7.4.patch
    M ./patches/series +1

Sat May 19 18:53:33 UTC 2012  Iustin Pop <iustin at debian.org>
  * Add patch for UTF-8 and GHC 7.4 changes
  Ignore-this: 982f1c9088e37dcf704ba7018360ccb2
diff -rN -u old-shelltestrunner//control new-shelltestrunner//control
--- old-shelltestrunner//control	2012-05-19 19:16:01.854324745 +0000
+++ new-shelltestrunner//control	2012-05-19 19:16:01.870327113 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.8)
-  , ghc
+  , ghc (>= 7.4)
   , libghc-utf8-string-dev (>= 0.3.5)
   , libghc-utf8-string-dev (<< 0.4)
   , libghc-diff-dev (>= 0.1)
diff -rN -u old-shelltestrunner//patches/fix-utf8-ghc7.4.patch new-shelltestrunner//patches/fix-utf8-ghc7.4.patch
--- old-shelltestrunner//patches/fix-utf8-ghc7.4.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-shelltestrunner//patches/fix-utf8-ghc7.4.patch	2012-05-19 19:16:01.882325939 +0000
@@ -0,0 +1,17 @@
+Description: Adapt to GHC 7.4 filename handling
+ GHC 7.4 already deals with unicode filenames, no need to encode/decode anymore.
+Author: Iustin Pop <iustin at debian.org>
+Forwarded: no
+Last-Update: 2012-05-19
+--- a/shelltest.hs
++++ b/shelltest.hs
+@@ -467,8 +467,4 @@
+ -- (cf http://www.dwheeler.com/essays/fixing-unix-linux-filenames.html)
+ -- and elsewhere we leave it unchanged.
+ toPlatformString :: String -> PlatformString
+-toPlatformString = case os of
+-                     "unix" -> UTF8.encodeString
+-                     "linux" -> UTF8.encodeString
+-                     "darwin" -> UTF8.encodeString
+-                     _ -> id
++toPlatformString = id
diff -rN -u old-shelltestrunner//patches/series new-shelltestrunner//patches/series
--- old-shelltestrunner//patches/series	2012-05-19 19:16:01.854324745 +0000
+++ new-shelltestrunner//patches/series	2012-05-19 19:16:01.886324835 +0000
@@ -1,2 +1,3 @@
 remove-cabal-th-dependency.patch
 fix-test-framework-deps.patch
+fix-utf8-ghc7.4.patch





More information about the Pkg-haskell-commits mailing list