diff -Nru haskell-xml-1.3.10/debian/changelog haskell-xml-1.3.12/debian/changelog
--- haskell-xml-1.3.10/debian/changelog	2011-10-08 22:02:40.000000000 +0000
+++ haskell-xml-1.3.12/debian/changelog	2012-02-07 21:49:56.000000000 +0000
@@ -1,3 +1,9 @@
+haskell-xml (1.3.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata@debian.org>  Tue, 07 Feb 2012 22:49:56 +0100
+
 haskell-xml (1.3.10-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru haskell-xml-1.3.10/Setup.hs haskell-xml-1.3.12/Setup.hs
--- haskell-xml-1.3.10/Setup.hs	2011-09-21 17:46:38.000000000 +0000
+++ haskell-xml-1.3.12/Setup.hs	2012-01-17 21:06:26.000000000 +0000
@@ -4,4 +4,4 @@
 
 
 main :: IO ()
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMain
diff -Nru haskell-xml-1.3.10/Text/XML/Light/Output.hs haskell-xml-1.3.12/Text/XML/Light/Output.hs
--- haskell-xml-1.3.10/Text/XML/Light/Output.hs	2011-09-21 17:46:38.000000000 +0000
+++ haskell-xml-1.3.12/Text/XML/Light/Output.hs	2012-01-17 21:06:26.000000000 +0000
@@ -175,11 +175,10 @@
   -- rendering &apos; in xhtml.
   -- Reported by Rohan Drape <rohan.drape@gmail.com>.
   '\''  -> showString "&#39;"
-  -- XXX: Is this really wortherd?
-  -- We could deal with these issues when we convert characters to bytes.
+
   -- NOTE: We escape '\r' explicitly because otherwise they get lost
   -- when parsed back in because of then end-of-line normalization rules.
-  _ | (oc <= 0x7f && isPrint c) || c == '\n' -> showChar c
+  _ | isPrint c || c == '\n' -> showChar c
     | otherwise -> showString "&#" . shows oc . showChar ';'
       where oc = ord c
 
diff -Nru haskell-xml-1.3.10/Text/XML/Light/Types.hs haskell-xml-1.3.12/Text/XML/Light/Types.hs
--- haskell-xml-1.3.10/Text/XML/Light/Types.hs	2011-09-21 17:46:38.000000000 +0000
+++ haskell-xml-1.3.12/Text/XML/Light/Types.hs	2012-01-17 21:06:26.000000000 +0000
@@ -11,8 +11,12 @@
 -- Basic XML types.
 --
 
+{-# LANGUAGE DeriveDataTypeable #-}
 module Text.XML.Light.Types where
 
+import Data.Typeable(Typeable)
+import Data.Data(Data)
+
 -- | A line is an Integer
 type Line     = Integer
 
@@ -20,7 +24,7 @@
 data Content  = Elem Element
               | Text CData
               | CRef String
-                deriving Show
+                deriving (Show, Typeable, Data)
 
 -- | XML elements
 data Element  = Element {
@@ -28,33 +32,33 @@
                   elAttribs   :: [Attr],
                   elContent   :: [Content],
                   elLine      :: Maybe Line
-                } deriving Show
+                } deriving (Show, Typeable, Data)
 
 -- | XML attributes
 data Attr     = Attr {
                   attrKey :: QName,
                   attrVal :: String
-                } deriving (Eq,Ord,Show)
+                } deriving (Eq, Ord, Show, Typeable, Data)
 
 -- | XML CData
 data CData    = CData {
                   cdVerbatim  :: CDataKind,
                   cdData      :: String,
                   cdLine      :: Maybe Line
-                } deriving Show
+                } deriving (Show, Typeable, Data)
 
 data CDataKind
  = CDataText      -- ^ Ordinary character data; pretty printer escapes &, < etc.
  | CDataVerbatim  -- ^ Unescaped character data; pretty printer embeds it in <![CDATA[..
  | CDataRaw       -- ^ As-is character data; pretty printer passes it along without any escaping or CDATA wrap-up.
-   deriving ( Eq, Show )
+   deriving ( Eq, Show, Typeable, Data )
 
 -- | XML qualified names
 data QName    = QName {
                   qName   :: String,
                   qURI    :: Maybe String,
                   qPrefix :: Maybe String
-                } deriving Show
+                } deriving (Show, Typeable, Data)
 
 
 instance Eq QName where
diff -Nru haskell-xml-1.3.10/xml.cabal haskell-xml-1.3.12/xml.cabal
--- haskell-xml-1.3.10/xml.cabal	2011-09-21 17:46:38.000000000 +0000
+++ haskell-xml-1.3.12/xml.cabal	2012-01-17 21:06:26.000000000 +0000
@@ -1,5 +1,5 @@
 Name:            xml
-Version:         1.3.10
+Version:         1.3.12
 Homepage:        http://code.galois.com
 Synopsis:        A simple XML library.
 Description:     A simple XML library.
@@ -9,14 +9,23 @@
 Author:          Galois Inc.
 Maintainer:      diatchki@galois.com
 Copyright:       (c) 2007-2008 Galois Inc.
-Build-depends:   base >= 3 && < 5, bytestring, text
-Ghc-options:     -Wall -O2
-Exposed-modules: Text.XML.Light,
-                 Text.XML.Light.Types,
-                 Text.XML.Light.Output,
-                 Text.XML.Light.Input,
-                 Text.XML.Light.Lexer,
-                 Text.XML.Light.Proc
-                 Text.XML.Light.Cursor
-Extensions:      FlexibleInstances
 Build-type:      Simple
+Cabal-version:   >= 1.6
+
+
+library
+  Build-depends:   base >= 3 && < 5, bytestring, text
+  Ghc-options:     -Wall -O2
+  Exposed-modules: Text.XML.Light,
+                   Text.XML.Light.Types,
+                   Text.XML.Light.Output,
+                   Text.XML.Light.Input,
+                   Text.XML.Light.Lexer,
+                   Text.XML.Light.Proc
+                   Text.XML.Light.Cursor
+  Extensions:      FlexibleInstances
+
+source-repository head
+  type:       git
+  location:   git://code.galois.com/xml.git
+