Bug#629725: twidge: diff for NMU version 1.0.8.1+nmu1

tags 629725 + patch
tags 629725 + pending
thanks

Hi there,

I've prepared an NMU for twidge (versioned as 1.0.8.1+nmu1) and
uploaded it.

I had to do some porting to the new HaXml API, but it wasn't too bad.

Thanks,

Iain Lane [ iain@orangesquash.org.uk ]
Debian Developer [ laney@debian.org ]
Ubuntu Developer [ laney@ubuntu.com ]
PhD student [ ial@cs.nott.ac.uk ]


diff -Nru twidge-1.0.8.1/Commands/Ls.hs twidge-1.0.8.1+nmu1/Commands/Ls.hs
twidge-1.0.8.1/Commands/Ls.hs 2010-06-03 13:39:19.000000000 +0100
+++ twidge-1.0.8.1+nmu1/Commands/Ls.hs 2011-07-28 13:50:22.000000000 +0100
@@ -26,6 +26,7 @@
import System.Console.GetOpt
import Data.List
import Text.XML.HaXml hiding (when)
+import Text.XML.HaXml.Posn
import Download
import FeedParser
import Data.ConfigFile
@@ -258,7 +259,7 @@
in do mapM_ (printfunc section cp args) statuses
return statuses

-procStatuses :: Content -> Message
+procStatuses :: Content Posn -> Message
procStatuses item =
Message {sId = s (tag "id") item,
sSender = s (tag "user" /> tag "screen_name") item,
@@ -268,7 +269,7 @@

s f item = sanitize $ contentToString (keep /> f /> txt $ item)

-procDM :: Content -> Message
+procDM :: Content Posn -> Message
procDM item =
Message {sId = s (tag "id") item,
sSender = s (tag "sender_screen_name") item,
@@ -417,7 +418,7 @@

getUsers = tag "users" /> tag "user"

- procUsers :: Content -> (String, String)
+ procUsers :: Content Posn -> (String, String)
procUsers item =
(sanitize $ contentToString (keep /> tag "screen_name" /> txt $ item),
sanitize $ contentToString (keep /> tag "id" /> txt $ item))
diff -Nru twidge-1.0.8.1/debian/changelog twidge-1.0.8.1+nmu1/debian/changelog
twidge-1.0.8.1/debian/changelog 2011-01-07 04:19:07.000000000 +0000
+++ twidge-1.0.8.1+nmu1/debian/changelog 2011-07-28 14:10:36.000000000 +0100
@@ -1,3 +1,11 @@
+twidge (1.0.8.1+nmu1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix build deps to refer to ghc instead of ghc6 (Closes: #629725)
+ * Work on newer HaXml in Debian
+
+ -- Iain Lane <laney@debian.org> Thu, 28 Jul 2011 13:15:31 +0100
+
twidge (1.0.8.1) unstable; urgency=low

* Clean up a debian packaging bug introduced in 3rd-party commit
diff -Nru twidge-1.0.8.1/debian/control twidge-1.0.8.1+nmu1/debian/control
twidge-1.0.8.1/debian/control 2011-01-04 19:26:13.000000000 +0000
+++ twidge-1.0.8.1+nmu1/debian/control 2011-07-28 13:52:20.000000000 +0100
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends: debhelper (>= 7), groff, docbook-utils, jade, lynx, scons, poppler-utils, sgml2x, gtk-doc-tools, ghc6 (>= 6.8.2), haskell-devscripts (>= 0.6.6), libghc6-missingh-dev (>= 1.0.0), libghc6-network-dev, libghc6-unix-dev, libghc6-mtl-dev, libghc6-haxml-dev (>= 1.13.2-3), libghc6-filepath-dev, libghc6-configfile-dev (>= 1.0.4.5), libghc6-hslogger-dev (>= 1.0.7.1), libghc6-regex-posix-dev, libghc6-utf8-string-dev, libghc6-hsh-dev (>= 1.2.6.3), libghc6-hoauth-dev
+Build-Depends: debhelper (>= 7), groff, docbook-utils, jade, lynx, scons, poppler-utils, sgml2x, gtk-doc-tools, ghc (>= 6.8.2), haskell-devscripts (>= 0.6.6), libghc-missingh-dev (>= 1.0.0), libghc-network-dev, libghc-unix-dev, libghc-mtl-dev, libghc-haxml-dev (>= 1.20), libghc-filepath-dev, libghc-configfile-dev (>= 1.0.4.5), libghc-hslogger-dev (>= 1.0.7.1), libghc-regex-posix-dev, libghc-utf8-string-dev, libghc-hsh-dev (>= 1.2.6.3), libghc-hoauth-dev
Standards-Version: 3.9.1
Homepage: http://software.complete.org/twidge
Vcs-Browser: http://git.complete.org/twidge
diff -Nru twidge-1.0.8.1/FeedParser.hs twidge-1.0.8.1+nmu1/FeedParser.hs
twidge-1.0.8.1/FeedParser.hs 2010-06-02 21:01:01.000000000 +0100
+++ twidge-1.0.8.1+nmu1/FeedParser.hs 2011-07-28 13:48:36.000000000 +0100
@@ -31,6 +31,7 @@
module FeedParser where

import Text.XML.HaXml
+import Text.XML.HaXml.Posn
import Data.Char
import Data.List
import Data.String.Utils(strip)
@@ -44,16 +45,16 @@
Because HaXml's unescaping only works on Elements, we must make sure that
whatever Content we have is wrapped in an Element, then use txt to
pull the insides back out. -}
-contentToString :: [Content] -> String
+contentToString :: [Content Posn] -> String
contentToString =
concatMap procContent
where procContent x =
- verbatim $ keep /> txt $ CElem (unesc (fakeElem x))
+ verbatim $ keep /> txt $ CElem (unesc (fakeElem x)) noPos

- fakeElem :: Content -> Element
+ fakeElem :: Content a -> Element a
fakeElem x = Elem "fake" [] [x]

- unesc :: Element -> Element
+ unesc :: Element a -> Element a
unesc = xmlUnEscape stdXmlEscaper

stripUnicodeBOM :: String -> String
@@ -67,4 +68,4 @@
| c `elem` "\0\t" = ' '
| otherwise = c

-getContent (Document _ _ e _) = CElem e
+getContent (Document _ _ e _) = CElem e noPos
diff -Nru twidge-1.0.8.1/twidge.cabal twidge-1.0.8.1+nmu1/twidge.cabal
twidge-1.0.8.1/twidge.cabal 2011-01-05 16:26:08.000000000 +0000
+++ twidge-1.0.8.1+nmu1/twidge.cabal 2011-07-28 13:51:58.000000000 +0100
@@ -48,7 +48,7 @@

Executable twidge
Build-Depends: network, unix, parsec, MissingH>=1.0.0,
- mtl, base >= 4 && < 5, HaXml>=1.13.2, HaXml<1.19, hslogger, hoauth>=0.2.3 && <0.2.4,
+ mtl, base >= 4 && < 5, HaXml>1.20, hslogger, hoauth>=0.2.3 && <0.2.4,
ConfigFile, directory, HSH, regex-posix, utf8-string, binary,
bytestring, curl








To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org