[DHG_packages] 02/03: xmlhtml: Update d/patches

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit 28e9760b2a9bad64c2027c73dae658cc23bad89b
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Fri Oct 20 16:44:55 2017 +0300

    xmlhtml: Update d/patches
    
    - Drop saner-testsuite, applied upstream
    - Modify no-bytestring-builder to apply cleanly
---
 p/haskell-xmlhtml/debian/changelog                 |  3 +++
 .../debian/patches/no-bytestring-builder           |  8 ++++---
 p/haskell-xmlhtml/debian/patches/saner-testsuite   | 28 ----------------------
 p/haskell-xmlhtml/debian/patches/series            |  1 -
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/p/haskell-xmlhtml/debian/changelog b/p/haskell-xmlhtml/debian/changelog
index 6bce17e..64348dc 100644
--- a/p/haskell-xmlhtml/debian/changelog
+++ b/p/haskell-xmlhtml/debian/changelog
@@ -1,6 +1,9 @@
 haskell-xmlhtml (0.2.5.1-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #867151)
+  * Update d/patches
+    - Drop saner-testsuite, applied upstream
+    - Modify no-bytestring-builder to apply cleanly
 
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 20 Oct 2017 16:42:24 +0300
 
diff --git a/p/haskell-xmlhtml/debian/patches/no-bytestring-builder b/p/haskell-xmlhtml/debian/patches/no-bytestring-builder
index c4978d9..1ff536c 100644
--- a/p/haskell-xmlhtml/debian/patches/no-bytestring-builder
+++ b/p/haskell-xmlhtml/debian/patches/no-bytestring-builder
@@ -1,6 +1,8 @@
+Index: b/xmlhtml.cabal
+===================================================================
 --- a/xmlhtml.cabal
 +++ b/xmlhtml.cabal
-@@ -825,7 +825,6 @@
+@@ -826,7 +826,6 @@ Library
                         blaze-html           >= 0.9   && < 0.10,
                         blaze-markup         >= 0.8   && < 0.9,
                         bytestring           >= 0.9   && < 0.11,
@@ -8,11 +10,11 @@
                         containers           >= 0.3   && < 0.6,
                         parsec               >= 3.1.2 && < 3.2,
                         text                 >= 0.11  && < 1.3,
-@@ -854,7 +853,6 @@
+@@ -855,7 +854,6 @@ Test-suite testsuite
      blaze-html,
      blaze-markup,
      bytestring,
 -    bytestring-builder,
+     containers,
      directory                  >= 1.0      && <1.4,
      hspec                      >= 2.4      && <2.5,
-     text,
diff --git a/p/haskell-xmlhtml/debian/patches/saner-testsuite b/p/haskell-xmlhtml/debian/patches/saner-testsuite
deleted file mode 100644
index b7f1c9c..0000000
--- a/p/haskell-xmlhtml/debian/patches/saner-testsuite
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/test/src/Text/XmlHtml/Tests.hs
-+++ b/test/src/Text/XmlHtml/Tests.hs
-@@ -539,7 +539,7 @@
-     testIt "bothQuotesInAttr       " bothQuotesInAttr
-     testIt "ndashEscapesInLatin    " ndashEscapesInLatin
-     testIt "smileyEscapesInLatin   " smileyEscapesInLatin
--    testIt "numericalEscapes       " numericalEscapes
-+    testCase "numericalEscapes       " numericalEscapes
- 
- renderByteOrderMark :: Bool
- renderByteOrderMark =
-@@ -635,11 +635,11 @@
-         ]))
-     == "Hello ☺"
- 
--numericalEscapes :: Bool
--numericalEscapes =
--    fmap (toByteString . renderXmlFragment ISO_8859_1 . docContent)
--    (parseXML "test" "Hello ®")
--    == Right "Hello ®"
-+numericalEscapes :: Assertion
-+numericalEscapes = assertEqual "nE"
-+    (fmap (toByteString . renderXmlFragment ISO_8859_1 . docContent)
-+    (parseXML "test" "Hello ®"))
-+    (Right "Hello ®")
- 
- 
- ------------------------------------------------------------------------------
diff --git a/p/haskell-xmlhtml/debian/patches/series b/p/haskell-xmlhtml/debian/patches/series
index 91489a5..d61cbb2 100644
--- a/p/haskell-xmlhtml/debian/patches/series
+++ b/p/haskell-xmlhtml/debian/patches/series
@@ -1,2 +1 @@
-saner-testsuite
 no-bytestring-builder

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