--- haddock-2.4.1.orig/debian/compat +++ haddock-2.4.1/debian/compat @@ -0,0 +1 @@ +4 --- haddock-2.4.1.orig/debian/rules +++ haddock-2.4.1/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +prefix := /usr +destdir := debian/haddock + +default: build + +doc/configure: + cd doc && autoconf + +configure: configure-stamp +configure-stamp: patch doc/configure + dh_testdir + + ghc6 --make Setup.lhs -o setup + ./setup configure --prefix=$(prefix) --with-compiler=/usr/bin/ghc6 + touch doc/configure + chmod +x doc/configure + cd doc && ./configure --prefix=$(prefix) + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + ./setup build + $(MAKE) -C doc html + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + +# $(MAKE) -C doc distclean + ghc6 --make Setup.lhs -o setup + ./setup clean + rm -f Setup.o Setup.hi setup + # Hacks: + rm -f doc/config.log doc/config.status doc/config.mk doc/configure + rm -rf doc/haddock/ + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs usr/share/doc/haddock/html/ + + ./setup copy --destdir=$(CURDIR)/$(destdir) + rm -rf $(CURDIR)/$(destdir)/$(prefix)/share/doc/haddock-*/ + +# install docs + cp -r doc/haddock/* \ + $(CURDIR)/$(destdir)/$(prefix)/share/doc/haddock/html/ + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + # haddock/doc/haddock.dvi haddock/doc/haddock.ps + dh_installexamples examples/*.hs + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron + dh_installman debian/haddock.1 +# dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- haddock-2.4.1.orig/debian/changelog +++ haddock-2.4.1/debian/changelog @@ -0,0 +1,177 @@ +haddock (2.4.1-4ubuntu1) karmic; urgency=low + + * Do not build-depend on docbook-utils on powerpc to avoid texlive-base + dependency which causes a FTBFS due to a dpkg-trigger configure error. + This change can be reverted when a real fix is found. + + -- Luca Falavigna Sun, 17 May 2009 17:43:39 +0000 + +haddock (2.4.1-4) unstable; urgency=low + + * Built against ghc6 6.10.1+dfsg1-13, giving .haddock files uniform + representation on 32 and 64 bit architectures. (Closes: #516424) + + -- Kari Pahula Wed, 25 Feb 2009 15:28:37 +0200 + +haddock (2.4.1-3) unstable; urgency=low + + * Uploaded to unstable. + + -- Kari Pahula Mon, 16 Feb 2009 22:46:37 +0200 + +haddock (2.4.1-2) experimental; urgency=low + + * Patch src/Haddock/Backends/Html.hs to provide a case for topDeclBox + when DocName is Undocumented. + * Removed the watch file. (Closes: #449863) + + -- Kari Pahula Thu, 05 Feb 2009 11:04:36 +0200 + +haddock (2.4.1-1) experimental; urgency=low + + * New upstream release. (Closes: #464364) + * New maintainer. + * Set standards-version to 3.8.0, add Homepage field in + debian/control. + * Add info about the copyright status of the files in src/Haddoc/Utils/ + to debian/copyright. + * Don't install anything to /usr/share/doc/haddock-$version/. + * Changed doc-base section to Programming/Haskell. + * Removed xutils from build dependencies. + * Hardcode ghc libdir and datadir in Main.hs in lieu of using ghc-paths. + * Patch source using quilt, added it as a build dep. + * Removed autogenerated doc/configure from the diff.gz and generate it + at build time instead. Added autoconf as a build dep. + + -- Kari Pahula Sun, 18 Jan 2009 20:38:28 +0200 + +haddock (0.8-2.1) unstable; urgency=low + + * Non-maintainer upload. + * haddock.cabal: Add directory, process, containers, array, pretty to + build-depends. (Closes: #460352) + + -- Marc 'HE' Brockschmidt Sat, 05 Apr 2008 14:45:46 +0200 + +haddock (0.8-2) unstable; urgency=low + + * Make .haddock files portable. We always serialise Int with 64 bits, + so 32-bit arches can understand files from 64-bit arches and + vice-versa. Closes: #426335. + + -- Ian Lynagh (wibble) Mon, 04 Jun 2007 14:29:40 +0000 + +haddock (0.8-1) unstable; urgency=low + + * New upstream version. Closes: #392381. + * Buildable with GHC 6.6. Closes: #393632. + * Build using cabal: + * Various debian/rules changes. + * Requires ghc6 >= 6.4.2. + * No longer uses config.sub/config.guess. Closes: #342419. + * Build-dep on alex as cleaning removes the generated lexer .hs files. + * Build-dep on happy as cleaning removes the generated parser .hs files. + * Set Standards-Version to 3.7.2 (no changes needed). + * Updated manpage debian/haddock.1. + * Drop duplicate docbook-utils build-dep. + * Remove debian/dirs and give usr/share/doc/haddock/html/ as an + argument to dh_installdirs. + * Added uscan watch file debian/watch. + * Added doc-base entry for Haddock User Guide in debian/doc-base. + * Removed haddock/ prefixes from various paths in debian/rules. + * Removed now redundant chmod -x hack on haddock/examples/Bug7.hs. + * doc/configure generated by autoconf is in the Debian diff. + * Thanks to Arjan Oosting, for pointing out and providing patches for much + of the above, including the updated manpage. + + -- Ian Lynagh (wibble) Tue, 17 Oct 2006 14:28:38 +0000 + +haddock (0.7-1) unstable; urgency=low + + * New upstream version. + * Add build-deps on docbook-xml, docbook-xsl, xsltproc, docbook-utils + for building the documentation. + * Remove unnecessary build-dep on happy. + * Remove option to use ghc5 to build. + * Remove use of {,} in debian/rules, and don't set SHELL to /bin/bash + in debian/rules. + * Do not build or install dvi and ps documentation as it breaks. + * index.html is now built, we don't need to symlink haddock.html to it. + + -- Ian Lynagh (wibble) Wed, 14 Sep 2005 21:32:46 +0000 + +haddock (0.6-2.1) unstable; urgency=low + + * NMU to make installable in unstable. + * Rebuild against newer GHC6 to link to appropriate libgmp. + * Fixed package options using patch from Daniel Schepler. + Closes: #316657. + * Set SHELL to /bin/bash due to bashisms in debian/rules. + + -- John Goerzen Fri, 9 Sep 2005 06:25:03 -0500 + +haddock (0.6-2) unstable; urgency=low + + * Re-upload so haddock is compiled against the latest ghc6 on all + arches that have ghc6. + + -- Ian Lynagh (wibble) Sun, 25 Jul 2004 01:23:10 +0000 + +haddock (0.6-1) unstable; urgency=low + + * New upstream version. + + -- Ian Lynagh (wibble) Wed, 26 Nov 2003 02:57:53 +0000 + +haddock (0.5-4) unstable; urgency=low + + * Add cases for various arches to configure{,.in} + + -- Ian Lynagh (wibble) Tue, 16 Sep 2003 12:29:35 +0000 + +haddock (0.5-3) unstable; urgency=low + + * Comment out flex requirement in configure{,.in} + + -- Ian Lynagh (wibble) Thu, 04 Sep 2003 23:11:54 +0000 + +haddock (0.5-2) unstable; urgency=low + + * Alter haddock/src/Makefile so LIBDIR points to /usr/share rather + then /usr/lib (contains a css and gif file). + + -- Ian Lynagh (wibble) Thu, 04 Sep 2003 18:36:30 +0000 + +haddock (0.5-1) unstable; urgency=low + + * New upstream version. + * New maintainer. + * Give ghc6 as an alternative build-dep to ghc5. + * No longer use autoconf; update build-deps to match. Closes: #173762. + * Hack configure and configure.in not to demand flex as the tarball has + the relevant files pregenerated. Remove flex build-dep. + * Require at least debhelper 4 and put 4 in debian/compat + * Add sparc Linux to configure and configure.in + * Simplify debian/rules to just work with the tarball in-place. + * Add doc to SUBDIRS in haddock/Makefile + * Change the haddock wrapper to set LIBDIR to /usr/share/haddock-0.5 + and remove the override that puts the gif and css file in /usr/lib + rather than /usr/share + + -- Ian Lynagh (wibble) Tue, 02 Sep 2003 22:08:23 +0000 + +haddock (0.4-1) unstable; urgency=low + + * new upstream release [tag: haddock-0-4] + * fixed typo + (closes: Bug#154756) + + -- Michael Weber Tue, 22 Oct 2002 09:44:11 +0200 + +haddock (0.3-1) unstable; urgency=low + + * Initial Release. + * added manpage for haddock + + -- Michael Weber Fri, 19 Jul 2002 21:52:06 +0200 + --- haddock-2.4.1.orig/debian/control +++ haddock-2.4.1/debian/control @@ -0,0 +1,27 @@ +Source: haddock +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Kari Pahula +Build-Depends: debhelper (>= 4), docbook-utils [!powerpc], ghc6 (>= 6.10.1+dfsg1-13), docbook-xml, docbook-xsl, xsltproc, alex, happy, quilt, autoconf +Standards-Version: 3.8.0 +Homepage: http://www.haskell.org/haddock/ + +Package: haddock +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: ghc6-doc (<< 6.10.1) +Description: Documentation tool for annotated Haskell source code + Haddock is a tool for automatically generating documentation from + annotated Haskell source code. It is primary intended for documenting + libraries, but it should be useful for any kind of Haskell code. + . + Haddock lets you write documentation annotations next to the + definitions of functions and types in the source code, in a syntax + that is easy on the eye when writing the source code (no heavyweight + mark-up). The documentation generated by Haddock is fully hyperlinked: + click on a type name in a type signature to go straight to the + definition, and documentation, for that type. + . + Haddock can generate documentation in multiple formats; currently HTML + is implemented, and there is partial support for generating DocBook. --- haddock-2.4.1.orig/debian/doc-base +++ haddock-2.4.1/debian/doc-base @@ -0,0 +1,11 @@ +Document: haddock-doc +Title: Haddock User Guide +Author: Simon Marlow +Abstract: User guide for Haddock, a tool for automatically generating + documentation from annotated Haskell source code. +Section: Programming/Haskell + +Format: html +Index: /usr/share/doc/haddock/html/index.html +Files: /usr/share/doc/haddock/html/*.html + --- haddock-2.4.1.orig/debian/copyright +++ haddock-2.4.1/debian/copyright @@ -0,0 +1,48 @@ +This package was first debianized by Michael Weber on +Tue, 16 Jul 2002 10:50:21 +0200. + +It was taken over by Ian Lynagh on 2003-09-02. +Since 2009-01-12 Kari Pahula . + +It was downloaded from http://www.haskell.org/haddock/ + + +Upstream Author: Simon Marlow (simonmar@microsoft.com) + + +Copyright: + +Copyright 2002-2008, Simon Marlow. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +- Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Contains Html.hs and BlockTable.hs, which are part of +the HTML combinator library. +Copyright 1999-2001 Andy Gill +Copyright 1999-2001 The Oregon Graduate Institute of Science and Technology +BSD style license, see /usr/share/common-licenses/BSD. + +Contains FastMutInt2.hs, which is part of the GHC compiler. +Copyright 2002 The University of Glasgow +BSD style license. --- haddock-2.4.1.orig/debian/haddock.1 +++ haddock-2.4.1/debian/haddock.1 @@ -0,0 +1,231 @@ +.TH HADDOCK 1 "September 2006" "Haddock, version 0.8" "Haddock documentation generator" + + +.SH NAME +haddock \- documentation tool for annotated Haskell source code + + +.SH SYNOPSIS +.B haddock +.RI [ options ] " file" ... + + +.SH DESCRIPTION +This manual page documents briefly the +.B haddock +command. +Extensive documentation is available in various other formats including DVI, +PostScript and HTML; see below. + +.PP +.I file +is a filename containing a Haskell source module. +All the modules specified on the command line will be processed together. +When one module refers to an entity in another module being processed, the +documentation will link directly to that entity. + +Entities that cannot be found, for example because they are in a module that +is not being processed as part of the current batch, simply will not be +hyperlinked in the generated documentation. +.B haddock +will emit warnings listing all the identifiers it could not resolve. + +The modules should not be mutually recursive, as +.B haddock +does not like swimming in circles. + + +.SH OPTIONS +The programs follow the usual GNU command line syntax, with long +options starting with two dashes (`--'). +A summary of options is included below. +For a complete description, see the other documentation. + +.TP +\fB\-o \fIDIR\fP, \-\-odir=\fIDIR\fP +directory in which to put the output files + +.TP +\fB\-i \fIFILE\fP, \-\-read-interface=\fIFILE\fP +read an interface from +.IR FILE . + +.TP +\fB\-D \fIFILE\fP, \-\-dump\-interface=\fIFILE\fP +dump an interface for these modules in +.IR FILE . + +.TP +\fB\-l \fIDIR\fP, \-\-lib=\fIDIR\fP +location of Haddock's auxiliary files + +.TP +.BR \-h ", " \-\-html +Generate documentation in HTML format. +Several files will be generated into the current directory (or the specified +directory if the +.B \-o +option is given), including the following: +.RS +.TP +.I index.html +The top level page of the documentation: +lists the modules available, using indentation to represent the hierarchy if +the modules are hierarchical. +.TP +.I haddock.css +The stylesheet used by the generated HTML. +Feel free to modify this to change the colors or layout, or even specify +your own stylesheet using the +.B \-\-css +option. +.TP +.I module.html +An HTML page for each module. +.TP +.IR doc-index.html ", " doc-index-XX.html +The index, split into two (functions/constructors and types/classes, as per +Haskell namespaces) and further split alphabetically. +.RE + +.TP +.B \-\-hoogle +output for Hoogle + +.TP +\fB\-\-html\-help=\fIformat +produce index and table of contents in mshelp, mshelp2 or devhelp format +(with \fI\-h\fP) + +.TP +\fB\-\-source\-base=\fPURL +Include links to the source files in the generated documentation, where URL +is the base URL where the source files can be found. + +.TP +\fB\-s \fPURL, \fB\-\-source\-module=\fPURL +Include links to the source files in the generated documentation, where URL +is a source code link for each module (using the %{FILE} or %{MODULE} vars). + +.TP +\fB\-\-source\-entity=\fPURL +Include links to the source files in the generated documentation, where URL +is a source code link for each entity (using the %{FILE}, %{MODULE} or %{NAME} vars). + +.TP +\fB\-\-comments\-base=\fPURL +URL for a comments link on the contents and index pages. +.TP +\fB\-\-comments\-module=\fPURL +URL for a comments link for each module (using the %{MODULE} var). +.TP +\fB\-\-comments\-entity=\fPURL +URL for a comments link for each entity (using the %{FILE}, %{MODULE} or %{NAME} vars). +.TP +.BI \-\-css= FILE +Use the CSS +.I FILE +instead of the default stylesheet that comes with +.B haddock +for HTML output. It should specify certain classes: see the default stylesheet for details. + +.TP +\fB\-p \fIFILE\fP, \-\-prologue=\fIFILE\fP +Specify a file containing prologue text. + +.TP +\fB\-t \fITITLE\fP, \-\-title=\fITITLE\fP +Use \fITITLE\fP as the page heading for each page in the documentation. +This will normally be the name of the library being documented. + +The title should be a plain string (no markup please!). + +.TP +\fB\-k \fINAME\fP, \-\-package=\fINAME\fP +Specify the package name (optional). + +.TP +.BR \-n ", " \-\-no\-implicit\-prelude +do not assume Prelude is imported + +.TP +.BR \-d ", " \-\-debug +Enable extra debugging output. + +.TP +.BR \-? ", " \-\-help +Display help. + +.TP +.BR \-V ", " \-\-version +Display version. + +.TP +.BR \-v ", " \-\-verbose +Verbose status reporting. + +.TP +\fB\-\-use\-contents=\fPURL +Use a separately-generated HTML contents page. + +.TP +.B \-\-gen\-contents +Generate an HTML contents from specified interfaces. + +.TP +\fB\-\-use\-index=\fPURL +Use a separately-generated HTML index. + +.TP +.B \-\-gen\-index +Generate an HTML index from specified interfaces. + +.TP +.B \-\-ignore\-all\-exports +Behave as if all modules have the ignore-exports atribute + +.TP +\fB\-\-hide=\fIMODULE +Behave as if \fIMODULE\fP has the hide attribute. + +.TP +\fB\-\-use\-package=\fIPACKAGE +The modules being processed depend on \fIPACKAGE\fP. + +.SH FILES +.I /usr/bin/haddock +.br +.I /usr/share/haddock-0.8/html/plus.gif +.br +.I /usr/share/haddock-0.8/html/minus.gif +.br +.I /usr/share/haddock-0.8/html/haskell_icon.gif +.br +.I /usr/share/haddock-0.8/html/haddock.js +.br +.I /usr/share/haddock-0.8/html/haddock.css +.br +.I /usr/share/haddock-0.8/html/haddock-DEBUG.css + +.SH SEE ALSO +.IR /usr/share/doc/haddock/ , +.br +the Haddock homepage +.UR http://haskell.org/haddock/ +(http://haskell.org/haddock/) +.UE + +.SH COPYRIGHT +Haddock version 0.8 + +Copyright 2006 Simon Marlow . +All rights reserved. + + +.SH AUTHOR +This manual page was written by Michael Weber +for the Debian GNU/Linux system (but may be used by others). + +.\" Local variables: +.\" mode: nroff +.\" End: --- haddock-2.4.1.orig/debian/patches/no-irrefutable-docname +++ haddock-2.4.1/debian/patches/no-irrefutable-docname @@ -0,0 +1,24 @@ +Index: haddock-2.4.1/src/Haddock/Backends/Html.hs +=================================================================== +--- haddock-2.4.1.orig/src/Haddock/Backends/Html.hs 2009-01-20 19:29:04.000000000 +0200 ++++ haddock-2.4.1/src/Haddock/Backends/Html.hs 2009-01-20 19:30:46.000000000 +0200 +@@ -1730,7 +1730,7 @@ + case maybe_wiki_url of + Nothing -> Html.emptyTable + Just url -> tda [theclass "declbut"] << +- let url' = spliceURL (Just fname) (Just mod) ++ let url' = spliceURL (Just fname) mod + (Just n) (Just loc) url + in anchor ! [href url'] << toHtml "Comments" + +@@ -1741,7 +1741,9 @@ + origMod = nameModule n + + -- Name must be documented, otherwise we wouldn't get here +- Documented n mod = name ++ (n, mod) = case name of ++ Documented n' mod' -> (n', Just mod') ++ Undocumented n' -> (n', Nothing) + + fname = unpackFS (srcSpanFile loc) + --- haddock-2.4.1.orig/debian/patches/hardcode-ghc-paths +++ haddock-2.4.1/debian/patches/hardcode-ghc-paths @@ -0,0 +1,64 @@ +Index: haddock-2.4.1/haddock.cabal +=================================================================== +--- haddock-2.4.1.orig/haddock.cabal 2009-01-19 00:27:07.000000000 +0200 ++++ haddock-2.4.1/haddock.cabal 2009-01-19 00:27:10.000000000 +0200 +@@ -73,12 +73,6 @@ + containers, + array + +- if flag(in-ghc-tree) +- cpp-options: -DIN_GHC_TREE +- extensions: ForeignFunctionInterface +- else +- build-depends: ghc-paths +- + if impl(ghc >= 6.9) + build-depends: Cabal >= 1.5 + build-depends: base >= 4.0.0.0 && < 5.0.0.0 +Index: haddock-2.4.1/src/Main.hs +=================================================================== +--- haddock-2.4.1.orig/src/Main.hs 2009-01-19 00:27:07.000000000 +0200 ++++ haddock-2.4.1/src/Main.hs 2009-01-19 00:53:03.000000000 +0200 +@@ -47,10 +47,6 @@ + import Data.Int + #endif + +-#ifndef IN_GHC_TREE +-import GHC.Paths +-#endif +- + import GHC + import DynFlags + import Bag +@@ -150,14 +146,7 @@ + libDir <- case getGhcLibDir flags of + Just dir -> return dir + Nothing -> +-#ifdef IN_GHC_TREE +- do m <- getExecDir +- case m of +- Nothing -> error "No GhcLibDir found" +- Just d -> return (d "..") +-#else +- return libdir -- from GHC.Paths +-#endif ++ return "/usr/lib/ghc-6.10.1/" + + #if __GLASGOW_HASKELL__ >= 609 + -- initialize GHC +@@ -234,14 +223,7 @@ + + libdir <- case [str | Flag_Lib str <- flags] of + [] -> +-#ifdef IN_GHC_TREE +- do m <- getExecDir +- case m of +- Nothing -> error "No libdir found" +- Just d -> return (d "..") +-#else +- getDataDir -- provided by Cabal +-#endif ++ return "/usr/share/haddock-2.4.1/" + fs -> return (last fs) + + let css_file = case [str | Flag_CSS str <- flags] of --- haddock-2.4.1.orig/debian/patches/series +++ haddock-2.4.1/debian/patches/series @@ -0,0 +1,2 @@ +hardcode-ghc-paths +no-irrefutable-docname