[DHG_packages] 79/101: debian: Make the patch GHC-7.10-proof.

[Joachim Breitner]

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

nomeata pushed a commit to branch st3
in repository DHG_packages.

commit 49407079d4ddb02553893ad1b1dd34bfa6286a6c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 15 23:18:14 2015 +0200

    debian: Make the patch GHC-7.10-proof.
---
 p/haskell-debian/debian/changelog                 | 1 +
 p/haskell-debian/debian/patches/preserve-newlines | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/p/haskell-debian/debian/changelog b/p/haskell-debian/debian/changelog
index fec43da..32f909b 100644
--- a/p/haskell-debian/debian/changelog
+++ b/p/haskell-debian/debian/changelog
@@ -1,6 +1,7 @@
 haskell-debian (3.87.2-3) UNRELEASED; urgency=medium
 
   * Depend on old-{locale,time}
+  * Make the patch GHC-7.10-proof. 
 
  -- Joachim Breitner <nomeata at debian.org>  Sat, 15 Aug 2015 23:02:15 +0200
 
diff --git a/p/haskell-debian/debian/patches/preserve-newlines b/p/haskell-debian/debian/patches/preserve-newlines
index 96a52b0..810592b 100644
--- a/p/haskell-debian/debian/patches/preserve-newlines
+++ b/p/haskell-debian/debian/patches/preserve-newlines
@@ -10,8 +10,8 @@ Date:   Wed Aug 12 11:43:34 2015 +0200
 
 Index: haskell-debian/Debian/Control/Text.hs
 ===================================================================
---- haskell-debian.orig/Debian/Control/Text.hs	2015-08-12 17:13:45.922235347 +0200
-+++ haskell-debian/Debian/Control/Text.hs	2015-08-12 17:14:06.478389653 +0200
+--- haskell-debian.orig/Debian/Control/Text.hs	2015-08-15 23:17:28.452021248 +0200
++++ haskell-debian/Debian/Control/Text.hs	2015-08-15 23:17:45.920411378 +0200
 @@ -29,7 +29,7 @@
  import qualified Data.ByteString.Char8 as B
  import Data.Char (toLower, chr)
@@ -26,7 +26,7 @@ Index: haskell-debian/Debian/Control/Text.hs
                hasFieldName name (Field (fieldName',_)) = T.pack name == T.map toLower fieldName'
                hasFieldName _ _ = False
 -    stripWS = T.reverse . T.strip . T.reverse . T.strip
-+    stripWS = T.dropAround (`elem` " \t")
++    stripWS = T.dropAround (`elem` [' ','\t'])
 +      -- T.strip would also strip newlines
      protectFieldText = protectFieldText'
      asString = T.unpack

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