[DHG_packages] 02/02: debian: Upgrading from 3.87.2 to 3.89

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit 22302091c6a6a1de17ec2401a468a38a977a7fe1
Author: Clint Adams <clint at debian.org>
Date:   Sun Jan 10 21:30:51 2016 -0500

    debian: Upgrading from 3.87.2 to 3.89
---
 p/haskell-debian/debian/changelog                 |  6 +++++
 p/haskell-debian/debian/patches/preserve-newlines | 33 -----------------------
 p/haskell-debian/debian/patches/series            |  1 -
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/p/haskell-debian/debian/changelog b/p/haskell-debian/debian/changelog
index 847211d..67b2afa 100644
--- a/p/haskell-debian/debian/changelog
+++ b/p/haskell-debian/debian/changelog
@@ -1,3 +1,9 @@
+haskell-debian (3.89-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Sun, 10 Jan 2016 21:30:51 -0500
+
 haskell-debian (3.87.2-4) unstable; urgency=medium
 
   * Switch Vcs-Git/Vcs-Browser headers to new location.
diff --git a/p/haskell-debian/debian/patches/preserve-newlines b/p/haskell-debian/debian/patches/preserve-newlines
deleted file mode 100644
index 810592b..0000000
--- a/p/haskell-debian/debian/patches/preserve-newlines
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 26cc6a56bd4a7d8b31673f1ee47198a2949b3af3
-Author: Joachim Breitner <mail at joachim-breitner.de>
-Date:   Wed Aug 12 11:43:34 2015 +0200
-
-    Do not use T.strip
-    
-    as it strips newlines, which are significant (otherwise round-tripping a
-    Comment field starting in the second line is broken). Use T.dropAround
-    instead.
-
-Index: haskell-debian/Debian/Control/Text.hs
-===================================================================
---- 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)
- import Data.List (find)
--import qualified Data.Text as T (Text, pack, unpack, map, strip, reverse)
-+import qualified Data.Text as T (Text, pack, unpack, map, dropAround, reverse)
- import Data.Text.Encoding (decodeUtf8With, encodeUtf8)
- --import Data.Text.IO as T (readFile)
- import qualified Debian.Control.ByteString as B
-@@ -92,7 +92,8 @@
-         where hasFieldName :: String -> Field' T.Text -> Bool
-               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'])
-+      -- T.strip would also strip newlines
-     protectFieldText = protectFieldText'
-     asString = T.unpack
- 
diff --git a/p/haskell-debian/debian/patches/series b/p/haskell-debian/debian/patches/series
deleted file mode 100644
index 3ac8fc2..0000000
--- a/p/haskell-debian/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-preserve-newlines

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