Package: haxml
Version: 1.13.3-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
Hi,
[reportbug is acting a bit weird here, sorry if this doesn't work
properly]
I jumped the gun a bit and a further patch was needed. I took
inspiration from upstream and tweaked it a bit.
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/patches/09_link-to-other-docs.dpatch: Remove; this option has been
deleted by upstream and having it present causes a build failure.
* debian/patches/10_haddock-build.dpatch: Backport and modify patch from
upstream to fix haddock build. Add hscolour to build-depends-indep for
this.
It'd be cool to apply this in Debian.
Regards,
Iain
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500,
'karmic-proposed'), (500, 'karmic-backports'), (500, 'karmic')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.31-4-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
reverted:
--- haxml-1.13.3/debian/patches/09_link-to-other-docs.dpatch
+++ haxml-1.13.3.orig/debian/patches/09_link-to-other-docs.dpatch
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_link-to-other-docs.dpatch by Arjan Oosting <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add the appropriate --use-package options so haddock will link
-## DP: to names in other packages.
-
-
-...@dpatch@
-diff -urNad haxml-stable~/Makefile haxml-stable/Makefile
---- haxml-stable~/Makefile 2007-05-28 13:34:31.000000000 +0200
-+++ haxml-stable/Makefile 2007-05-28 13:35:20.000000000 +0200
-@@ -79,7 +79,7 @@
- do cpphs --noline -D__NHC__ $$file >$$file.uncpp; \
- done
- -mkdir docs/HaXml
-- haddock -h -t HaXml -o docs/HaXml $(patsubst %, %.uncpp, $(SRCS))
-+ haddock --use-package=base --use-package=haskell98 -h -t HaXml -o
docs/HaXml $(patsubst %, %.uncpp, $(SRCS))
- rm $(patsubst %, %.uncpp, $(SRCS))
-
- # packaging a distribution
diff -u haxml-1.13.3/debian/patches/00list haxml-1.13.3/debian/patches/00list
--- haxml-1.13.3/debian/patches/00list
+++ haxml-1.13.3/debian/patches/00list
@@ -9 +9 @@
-09_link-to-other-docs
+10_haddock-build
diff -u haxml-1.13.3/debian/changelog haxml-1.13.3/debian/changelog
diff -u haxml-1.13.3/debian/control haxml-1.13.3/debian/control
--- haxml-1.13.3/debian/control
+++ haxml-1.13.3/debian/control
@@ -1,9 +1,9 @@
Source: haxml
Section: devel
Priority: optional
Maintainer: Arjan Oosting <[email protected]>
Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>=
1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts (>= 0.6.7), html2text
-Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc
+Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc,
hscolour
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haxml
Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml
only in patch2:
unchanged:
--- haxml-1.13.3.orig/debian/patches/10_haddock-build.dpatch
+++ haxml-1.13.3/debian/patches/10_haddock-build.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_haddock-build.dpatch by Iain Lane <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad haxml-1.13.3~/Makefile haxml-1.13.3/Makefile
+--- haxml-1.13.3~/Makefile 2007-11-23 13:48:01.000000000 +0000
++++ haxml-1.13.3/Makefile 2009-08-04 22:03:22.000000000 +0100
+@@ -1,6 +1,10 @@
+ SOFTWARE = HaXml
+ VERSION = 1.13.3
+
++DIRS = Text Text/XML Text/XML/HaXml Text/XML/HaXml/Html \
++ Text/XML/HaXml/Xtract Text/XML/HaXml/DtdToHaskell \
++ Text/XML/HaXml/XmlContent Text/ParserCombinators
++
+ SRCS = \
+ src/Text/XML/HaXml.hs src/Text/XML/HaXml/Combinators.hs \
+ src/Text/XML/HaXml/Lex.hs \
+@@ -67,13 +78,21 @@
+ cd obj/nhc98; $(MAKE) HC=nhc98 install-filesonly-nhc98
+ install-filesonly-hugs: install-hugs
+ haddock:
+- #do cpp -P -traditional -D__NHC__ $$file >$$file.uncpp;
++ mkdir -p docs/HaXml
++ for dir in $(DIRS); \
++ do mkdir -p docs/HaXml/src/$$dir; \
++ mkdir -p staging/src/$$dir; \
++ done
+ for file in $(SRCS); \
+- do cpphs --noline -D__NHC__ $$file >$$file.uncpp; \
++ do \
++ cpphs --text --noline -D__GLASGOW_HASKELL__=610 $$file
>staging/$$file; \
++ HsColour -anchor -html $$file >docs/HaXml/`dirname
$$file`/`basename $$file .hs`.html; \
+ done
+- -mkdir docs/HaXml
+- haddock -h -t HaXml -o docs/HaXml $(patsubst %, %.uncpp, $(SRCS))
+- rm $(patsubst %, %.uncpp, $(SRCS))
++ haddock --html --title=HaXml --odir=docs/HaXml \
++ --source-module="src/%{MODULE/.//}.html" \
++ --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
++ $(patsubst %, staging/%, $(SRCS))
++ rm -rf staging
+
+ # packaging a distribution
+
