[Pkg-haskell-commits] darcs: haskell-hxt-tagsoup: Port to tagsoup 0.13.

[Colin Watson]

Wed Jan  1 14:20:07 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Port to tagsoup 0.13.

    M ./changelog +4
    M ./control -3 +4
    A ./patches/
    A ./patches/newer-tagsoup.patch
    A ./patches/series

Wed Jan  1 14:20:07 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Port to tagsoup 0.13.
diff -rN -u old-haskell-hxt-tagsoup/changelog new-haskell-hxt-tagsoup/changelog
--- old-haskell-hxt-tagsoup/changelog	2014-01-01 14:28:41.134586560 +0000
+++ new-haskell-hxt-tagsoup/changelog	2014-01-01 14:28:41.138586560 +0000
@@ -1,7 +1,11 @@
 haskell-hxt-tagsoup (9.1.1-5) UNRELEASED; urgency=low
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
+  [ Colin Watson ]
+  * Port to tagsoup 0.13.
+
  -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:20:48 +0200
 
 haskell-hxt-tagsoup (9.1.1-4) unstable; urgency=low
diff -rN -u old-haskell-hxt-tagsoup/control new-haskell-hxt-tagsoup/control
--- old-haskell-hxt-tagsoup/control	2014-01-01 14:28:41.134586560 +0000
+++ new-haskell-hxt-tagsoup/control	2014-01-01 14:28:41.138586560 +0000
@@ -9,9 +9,10 @@
 	ghc,
 	ghc-prof,
 	ghc-doc,
-	libghc-tagsoup-dev,  
-	libghc-tagsoup-prof,  
-	libghc-tagsoup-doc,  
+	libghc-tagsoup-dev (>= 0.13),
+	libghc-tagsoup-dev (<< 0.14),
+	libghc-tagsoup-prof,
+	libghc-tagsoup-doc,
 	libghc-hxt-dev (>= 9), libghc-hxt-dev (<< 10),
 	libghc-hxt-prof (>= 9), libghc-hxt-prof (<< 10),
 	libghc-hxt-doc (>= 9), libghc-hxt-doc (<< 10),
diff -rN -u old-haskell-hxt-tagsoup/patches/newer-tagsoup.patch new-haskell-hxt-tagsoup/patches/newer-tagsoup.patch
--- old-haskell-hxt-tagsoup/patches/newer-tagsoup.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hxt-tagsoup/patches/newer-tagsoup.patch	2014-01-01 14:28:41.138586560 +0000
@@ -0,0 +1,31 @@
+Description: Port to tagsoup 0.13
+Author: Colin Watson <cjwatson at debian.org>
+Forwarded: https://github.com/UweSchmidt/hxt/pull/13
+Last-Update: 2014-01-01
+
+Index: b/hxt-tagsoup.cabal
+===================================================================
+--- a/hxt-tagsoup.cabal
++++ b/hxt-tagsoup.cabal
+@@ -33,7 +33,7 @@
+  extensions: MultiParamTypeClasses DeriveDataTypeable FunctionalDependencies FlexibleInstances
+ 
+  build-depends: base               >= 4    && < 5,
+-                tagsoup            >= 0.10 && < 0.13,
++                tagsoup            >= 0.13 && < 0.14,
+                 hxt-charproperties >= 9    && < 10,
+                 hxt-unicode        >= 9    && < 10,
+                 hxt                >= 9.1  && < 10
+Index: b/src/Text/XML/HXT/Parser/TagSoup.hs
+===================================================================
+--- a/src/Text/XML/HXT/Parser/TagSoup.hs
++++ b/src/Text/XML/HXT/Parser/TagSoup.hs
+@@ -244,7 +244,7 @@
+ lookupEntity    :: Bool -> Bool -> (String, Bool) -> Tags
+ lookupEntity withWarnings _asHtml (e0@('#':e), withSemicolon)
+     = case lookupNumericEntity e of
+-      Just c  -> (TagText [c])
++      Just c  -> (TagText c)
+ 		 : missingSemi
+       Nothing -> ( TagText $ "&" ++ e0 ++ [';' | withSemicolon])
+ 		 : if withWarnings
diff -rN -u old-haskell-hxt-tagsoup/patches/series new-haskell-hxt-tagsoup/patches/series
--- old-haskell-hxt-tagsoup/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hxt-tagsoup/patches/series	2014-01-01 14:28:41.138586560 +0000
@@ -0,0 +1 @@
+newer-tagsoup.patch