[Pkg-haskell-commits] r1017 - in /packages/haxml/branches/upstream/current-stable: Build.bat HaXml.cabal Makefile README docs/changelog.html docs/index.html rpm.spec src/Makefile src/Text/XML/HaXml/Haskell2Xml.hs
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sun Jan 27 13:30:54 UTC 2008
Author: arjan
Date: Sun Jan 27 13:30:54 2008
New Revision: 1017
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1017
Log:
[svn-upgrade] Integrating new upstream version, haxml (1.13.3)
Modified:
packages/haxml/branches/upstream/current-stable/Build.bat
packages/haxml/branches/upstream/current-stable/HaXml.cabal
packages/haxml/branches/upstream/current-stable/Makefile
packages/haxml/branches/upstream/current-stable/README
packages/haxml/branches/upstream/current-stable/docs/changelog.html
packages/haxml/branches/upstream/current-stable/docs/index.html
packages/haxml/branches/upstream/current-stable/rpm.spec
packages/haxml/branches/upstream/current-stable/src/Makefile
packages/haxml/branches/upstream/current-stable/src/Text/XML/HaXml/Haskell2Xml.hs
Modified: packages/haxml/branches/upstream/current-stable/Build.bat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/Build.bat?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/Build.bat (original)
+++ packages/haxml/branches/upstream/current-stable/Build.bat Sun Jan 27 13:30:54 2008
@@ -21,7 +21,7 @@
set LD=C:\DEV\ghc\ghc-6.4\gcc-lib\ld.exe
rem Source directory for HaXml:
-set SRC=C:\DEV\Haskell\lib\HaXml-1.13.2\src
+set SRC=C:\DEV\Haskell\lib\HaXml-1.13.3\src
rem Two very long lines (500-600 chars) follow here.
rem They should not need changing.
Modified: packages/haxml/branches/upstream/current-stable/HaXml.cabal
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/HaXml.cabal?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/HaXml.cabal (original)
+++ packages/haxml/branches/upstream/current-stable/HaXml.cabal Sun Jan 27 13:30:54 2008
@@ -1,5 +1,5 @@
name: HaXml
-version: 1.13.2
+version: 1.13.3
license: LGPL
license-file: COPYRIGHT
author: Malcolm Wallace <Malcolm.Wallace at cs.york.ac.uk>
@@ -34,7 +34,7 @@
Text.XML.HaXml.Xtract.Lex,
Text.XML.HaXml.Xtract.Parse
hs-source-dir: src
-build-depends: base, haskell98
+build-depends: base, haskell98, pretty, containers
extensions: CPP
Executable: Canonicalise
Modified: packages/haxml/branches/upstream/current-stable/Makefile
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/Makefile?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/Makefile (original)
+++ packages/haxml/branches/upstream/current-stable/Makefile Sun Jan 27 13:30:54 2008
@@ -1,5 +1,5 @@
SOFTWARE = HaXml
-VERSION = 1.13.2
+VERSION = 1.13.3
SRCS = \
src/Text/XML/HaXml.hs src/Text/XML/HaXml/Combinators.hs \
Modified: packages/haxml/branches/upstream/current-stable/README
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/README?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/README (original)
+++ packages/haxml/branches/upstream/current-stable/README Sun Jan 27 13:30:54 2008
@@ -2,17 +2,26 @@
--------------------------------------------
Installation instructions:
-We currently support nhc98, ghc, and Hugs. The automatic configuration
-detects which compilers/interpreters you have, and prepares a build
-tree for each. Installation requires write-permission on the system
-directories of the compiler/interpreter - the libraries and interfaces
-can then be used as "-package HaXml" (for ghc/nhc98 - no extra options
-required for Hugs). The standalone tools are installed to a directory of
-your choice.
+
+For newer versions of ghc, use the standard Cabal mechanism:
+
+ runhaskell Setup.hs configure
+ runhaskell Setup.hs build
+ runhaskell Setup.hs install
+
+For older ghc, and current nhc98 and Hugs, use the following older build
+system.
./configure
make
make install
+
+The automatic configuration detects which compilers/interpreters you
+have, and prepares a build tree for each. Installation requires
+write-permission on the system directories of the compiler/interpreter -
+the libraries and interfaces can then be used as "-package HaXml" (for
+ghc/nhc98 - no extra options required for Hugs). The standalone tools
+are installed to a directory of your choice.
Options to configure are:
--buildwith=... e.g. ghc-6.2, to build for a specific compiler
Modified: packages/haxml/branches/upstream/current-stable/docs/changelog.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/docs/changelog.html?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/docs/changelog.html (original)
+++ packages/haxml/branches/upstream/current-stable/docs/changelog.html Sun Jan 27 13:30:54 2008
@@ -12,6 +12,12 @@
<h1>HaXml change log</h1>
</center>
<hr>
+
+<h3>Changes for 1.13.3</h3>
+<p>
+<ul>
+<li> Updated to work with ghc-6.6.1 (changes to .cabal file).
+</ul>
<h3>Changes for 1.13.2</h3>
<p>
Modified: packages/haxml/branches/upstream/current-stable/docs/index.html
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/docs/index.html?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/docs/index.html (original)
+++ packages/haxml/branches/upstream/current-stable/docs/index.html Sun Jan 27 13:30:54 2008
@@ -110,10 +110,10 @@
<center><h3><a name="downloads">Downloads</a></h3></center>
<p>
<b>Current version:</b>
-HaXml-1.13.2, release date 2006.09.08<br>
+HaXml-1.13.3, release date 2007.11.23<br>
By HTTP:
-<a href="http://www.haskell.org/HaXml/HaXml-1.13.2.tar.gz">.tar.gz</a>,
-<a href="http://www.haskell.org/HaXml/HaXml-1.13.2.zip">.zip</a>.
+<a href="http://www.haskell.org/HaXml/HaXml-1.13.3.tar.gz">.tar.gz</a>,
+<a href="http://www.haskell.org/HaXml/HaXml-1.13.3.zip">.zip</a>.
<br>
By FTP:
<a href="ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/">
@@ -137,9 +137,16 @@
<center><h3><a name="install">Installation</a></h3></center>
<p>
-To install HaXml, you must have a Haskell compiler: <em>ghc-5.02</em>
-or later, and/or <em>nhc98-1.14/hmake-3.06</em> or later, and/or
-<em>Hugs98 (Sept 2003)</em> or later. Use
+For recent <em>ghc</em>, use the standard Cabal installation mechanism:
+<pre>
+ runhaskell Setup.hs configure
+ runhaskell Setup.hs build
+ runhaskell Setup.hs install
+</pre>
+
+For older compilers: <em>ghc-5.02</em> or later, and/or
+<em>nhc98-1.14/hmake-3.06</em> or later, and/or <em>Hugs98 (Sept
+2003)</em> or later. Use
<pre>
./configure [--prefix=...] [--buildwith=...]
@@ -172,6 +179,12 @@
version here:
<a href="http://www.ninebynine.org/Software/HaskellUtils/">
<tt>http://www.ninebynine.org/Software/HaskellUtils/</tt></a>
+
+<p>
+The latest stable version (1.13.3) has the following features and fixes:<br>
+<ul>
+<li> Updated to work with ghc-6.8.1 (changes to .cabal file).
+</ul>
<p>
The latest stable version (1.13.2) has the following features and fixes:<br>
Modified: packages/haxml/branches/upstream/current-stable/rpm.spec
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/rpm.spec?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/rpm.spec (original)
+++ packages/haxml/branches/upstream/current-stable/rpm.spec Sun Jan 27 13:30:54 2008
@@ -2,7 +2,7 @@
Summary: Haskell utilities for processing XML
Name: HaXml
-Version: 1.13.2
+Version: 1.13.3
Release: 1
License: GPL/LGPL
Group: Development/Languages/Haskell
Modified: packages/haxml/branches/upstream/current-stable/src/Makefile
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/src/Makefile?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/src/Makefile (original)
+++ packages/haxml/branches/upstream/current-stable/src/Makefile Sun Jan 27 13:30:54 2008
@@ -1,5 +1,5 @@
SOFTWARE = HaXml
-VERSION = 1.13.1
+VERSION = 1.13.3
LIBSRCS = \
Text/XML/HaXml.hs Text/XML/HaXml/Combinators.hs Text/XML/HaXml/Lex.hs \
Modified: packages/haxml/branches/upstream/current-stable/src/Text/XML/HaXml/Haskell2Xml.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/upstream/current-stable/src/Text/XML/HaXml/Haskell2Xml.hs?rev=1017&op=diff
==============================================================================
--- packages/haxml/branches/upstream/current-stable/src/Text/XML/HaXml/Haskell2Xml.hs (original)
+++ packages/haxml/branches/upstream/current-stable/src/Text/XML/HaXml/Haskell2Xml.hs Sun Jan 27 13:30:54 2008
@@ -75,7 +75,11 @@
attval :: (Read a) => AttValue -> a
-attval (AttValue [Left s]) = read s
+attval (AttValue v) = read (concatMap decode v)
+ where
+ decode (Left v) = v
+ decode (Right (RefEntity ent)) = "&"++ent++";"
+ decode (Right (RefChar cref)) = "&"++show cref++";"
mkAttr :: String -> String -> Attribute
mkAttr n v = (n, AttValue [Left v])
More information about the Pkg-haskell-commits
mailing list