[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-5.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:07:38 UTC 2011
Fri Feb 5 10:05:15 UTC 2010 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.12.1-5.dsc
M ./changelog +11
M ./control -6 +7
A ./haddock.man
A ./patches.haddock/
A ./patches.haddock/hardcode-ghc-paths
A ./patches.haddock/no-irrefutable-docname
A ./patches.haddock/series
M ./patches/kfreebsd-_gnu_source-565818 +61
M ./rules -8 +24
Fri Feb 5 10:05:15 UTC 2010 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.12.1-5.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:07:38.757138172 +0000
+++ new-ghc/changelog 2011-01-15 06:07:38.857143438 +0000
@@ -1,3 +1,14 @@
+ghc6 (6.12.1-5) experimental; urgency=low
+
+ * Included haddock with the ghc6 package. Provides, conflicts and
+ replaces haddock. Copied over haddock.1 from the haddock package.
+ * Build with UseLibFFIForAdjustors=YES on alpha.
+ * Set ghc6 depend on libc6-dev. (Closes: #567809)
+ * Standards-Version 3.8.4, no changes necessary.
+ * Patch up the sources some more for kfreebsd. (Closes: #567298)
+
+ -- Kari Pahula <kaol at debian.org> Fri, 05 Feb 2010 12:05:15 +0200
+
ghc6 (6.12.1-4) experimental; urgency=low
* Patched utils/haddock/src/Haddock/Interface/Create.hs to use
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:07:38.757138172 +0000
+++ new-ghc/control 2011-01-15 06:07:38.853143228 +0000
@@ -2,16 +2,17 @@
Section: haskell
Priority: optional
Maintainer: Kari Pahula <kaol at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Build-Depends: debhelper (>= 7), libgmp3-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml, binutils (>= 2.19.51.20090508) [arm armel], libncurses5-dev
Homepage: http://haskell.org/ghc/
Package: ghc6
Architecture: any
-Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, ${shlibs:Depends}, ${misc:Depends}
-Provides: haskell-compiler, ghc, ${provided-devs}
-Conflicts: ghc4 (<= 4.08.1-4)
-Breaks: cabal-install (<< 0.8.0)
+Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Provides: haskell-compiler, ghc, haddock, ${provided-devs}
+Conflicts: ghc4 (<= 4.08.1-4), haddock
+Replaces: haddock
+Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.6.19)
Suggests: ghc6-prof, ghc6-doc, haskell-doc
Description: GHC - the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
@@ -46,7 +47,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
-Depends: haddock (>= 2.4.2), ${misc:Depends}
+Depends: haddock, ${misc:Depends}
Description: Documentation for the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
diff -rN -u old-ghc/haddock.man new-ghc/haddock.man
--- old-ghc/haddock.man 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/haddock.man 2011-01-15 06:07:38.825141753 +0000
@@ -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 <simonmar at microsoft.com>.
+All rights reserved.
+
+
+.SH AUTHOR
+This manual page was written by Michael Weber <michaelw at debian.org>
+for the Debian GNU/Linux system (but may be used by others).
+
+.\" Local variables:
+.\" mode: nroff
+.\" End:
diff -rN -u old-ghc/patches/kfreebsd-_gnu_source-565818 new-ghc/patches/kfreebsd-_gnu_source-565818
--- old-ghc/patches/kfreebsd-_gnu_source-565818 2011-01-15 06:07:38.757138172 +0000
+++ new-ghc/patches/kfreebsd-_gnu_source-565818 2011-01-15 06:07:38.837142385 +0000
@@ -15,3 +15,64 @@
#endif
#include "PosixSource.h"
+Index: ghc6-6.12.1/driver/mangler/ghc-asm.lprl
+===================================================================
+--- ghc6-6.12.1.orig/driver/mangler/ghc-asm.lprl 2010-02-05 11:53:12.000000000 +0200
++++ ghc6-6.12.1/driver/mangler/ghc-asm.lprl 2010-02-05 11:53:48.000000000 +0200
+@@ -216,7 +216,7 @@
+ $T_HDR_vector = "\.text\n\t\.align 8\n";
+
+ #--------------------------------------------------------#
+- } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|dragonfly|netbsd)$/m ) {
++ } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|dragonfly|netbsd|kfreebsd)$/m ) {
+
+ $T_STABBY = 0; # 1 iff .stab things (usually if a.out format)
+ $T_US = ''; # _ if symbols have an underscore on the front
+Index: ghc6-6.12.1/rts/Linker.c
+===================================================================
+--- ghc6-6.12.1.orig/rts/Linker.c 2010-02-05 11:54:20.000000000 +0200
++++ ghc6-6.12.1/rts/Linker.c 2010-02-05 11:56:52.000000000 +0200
+@@ -13,8 +13,8 @@
+ /* Linux needs _GNU_SOURCE to get RTLD_DEFAULT from <dlfcn.h> and
+ MREMAP_MAYMOVE from <sys/mman.h>.
+ */
+-#ifdef __linux__
+-#define _GNU_SOURCE
++#ifdef defined(__linux__) || defined(__GLIBC__)
++#define _GNU_SOURCE 1
+ #endif
+
+ #include "Rts.h"
+@@ -63,12 +63,12 @@
+ #include <sys/wait.h>
+ #endif
+
+-#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
++#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+ #define USE_MMAP
+ #include <fcntl.h>
+ #include <sys/mman.h>
+
+-#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
++#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -76,7 +76,7 @@
+
+ #endif
+
+-#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
++#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+ # define OBJFORMAT_ELF
+ #elif defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS)
+ # define OBJFORMAT_PEi386
+@@ -1410,7 +1410,7 @@
+ } else {
+ if ((W_)result > 0x80000000) {
+ // oops, we were given memory over 2Gb
+-#if defined(freebsd_HOST_OS) || defined(dragonfly_HOST_OS)
++#if defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS)
+ // Some platforms require MAP_FIXED. This is normally
+ // a bad idea, because MAP_FIXED will overwrite
+ // existing mappings.
diff -rN -u old-ghc/patches.haddock/hardcode-ghc-paths new-ghc/patches.haddock/hardcode-ghc-paths
--- old-ghc/patches.haddock/hardcode-ghc-paths 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches.haddock/hardcode-ghc-paths 2011-01-15 06:07:38.845142806 +0000
@@ -0,0 +1,61 @@
+Index: haddock-2.6.0/haddock.cabal
+===================================================================
+--- haddock-2.6.0.orig/haddock.cabal 2009-12-22 19:11:42.000000000 +0200
++++ haddock-2.6.0/haddock.cabal 2010-01-10 13:46:10.000000000 +0200
+@@ -74,12 +74,6 @@
+ Cabal >= 1.5,
+ ghc >= 6.12 && < 6.14
+
+- if flag(in-ghc-tree)
+- cpp-options: -DIN_GHC_TREE
+- extensions: ForeignFunctionInterface
+- else
+- build-depends: ghc-paths
+-
+ main-is: Main.hs
+ hs-source-dirs: src
+ extensions: CPP, PatternGuards, DeriveDataTypeable,
+Index: haddock-2.6.0/src/Main.hs
+===================================================================
+--- haddock-2.6.0.orig/src/Main.hs 2009-12-22 19:11:42.000000000 +0200
++++ haddock-2.6.0/src/Main.hs 2010-01-10 16:25:18.000000000 +0200
+@@ -46,13 +46,7 @@
+ import Foreign.C
+ import Data.Int
+ #endif
+-
+-#ifdef IN_GHC_TREE
+-import System.FilePath
+-#else
+-import GHC.Paths
+ import Paths_haddock
+-#endif
+
+ import GHC hiding (flags, verbosity)
+ import Config
+@@ -333,23 +327,13 @@
+ getHaddockLibDir :: [Flag] -> IO String
+ getHaddockLibDir flags = do
+ case [str | Flag_Lib str <- flags] of
+- [] ->
+-#ifdef IN_GHC_TREE
+- getInTreeLibDir
+-#else
+- getDataDir -- provided by Cabal
+-#endif
++ [] -> getDataDir
+ fs -> return (last fs)
+
+ getGhcLibDir :: [Flag] -> IO String
+ getGhcLibDir flags = do
+ case [ dir | Flag_GhcLibDir dir <- flags ] of
+- [] ->
+-#ifdef IN_GHC_TREE
+- getInTreeLibDir
+-#else
+- return libdir -- from GHC.Paths
+-#endif
++ [] -> return "/usr/lib/ghc- at PROJECTVERSION@/"
+ xs -> return $ last xs
+
+
diff -rN -u old-ghc/patches.haddock/no-irrefutable-docname new-ghc/patches.haddock/no-irrefutable-docname
--- old-ghc/patches.haddock/no-irrefutable-docname 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches.haddock/no-irrefutable-docname 2011-01-15 06:07:38.845142806 +0000
@@ -0,0 +1,25 @@
+Index: haddock-2.6.0/src/Haddock/Backends/Html.hs
+===================================================================
+--- haddock-2.6.0.orig/src/Haddock/Backends/Html.hs 2009-12-22 19:11:42.000000000 +0200
++++ haddock-2.6.0/src/Haddock/Backends/Html.hs 2010-01-10 13:57:21.000000000 +0200
+@@ -1855,7 +1855,7 @@
+ case maybe_wiki_url of
+ Nothing -> Html.emptyTable
+ Just url -> tda [theclass "declbut"] <<
+- let url' = spliceURL (Just fname) (Just mdl)
++ let url' = spliceURL (Just fname) mdl
+ (Just n) (Just loc) url
+ in anchor ! [href url'] << toHtml "Comments"
+
+@@ -1865,8 +1865,9 @@
+ -- the module defining the type family, which is wrong.
+ origMod = nameModule n
+
+- -- Name must be documented, otherwise we wouldn't get here
+- Documented n mdl = name
++ (n, mdl) = case name of
++ Documented n' mdl' -> (n', Just mdl')
++ Undocumented n' -> (n', Nothing)
+
+ fname = unpackFS (srcSpanFile loc)
+
diff -rN -u old-ghc/patches.haddock/series new-ghc/patches.haddock/series
--- old-ghc/patches.haddock/series 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches.haddock/series 2011-01-15 06:07:38.845142806 +0000
@@ -0,0 +1,2 @@
+hardcode-ghc-paths
+no-irrefutable-docname
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 06:07:38.757138172 +0000
+++ new-ghc/rules 2011-01-15 06:07:38.853143228 +0000
@@ -36,17 +36,22 @@
echo "SRC_HC_OPTS += -lffi" >> mk/build.mk
echo "HADDOCK_DOCS := YES" >> mk/build.mk
echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifeq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc))
- echo "GhcUnregisterised=YES" >> mk/build.mk
-else
+ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc))
echo "GhcUnregisterised=NO" >> mk/build.mk
+else
+ echo "GhcUnregisterised=YES" >> mk/build.mk
endif
-ifeq (powerpc,$(DEB_HOST_ARCH)) # See #365497
+ifeq (powerpc,$(DEB_HOST_ARCH)) # See #365497
echo "GhcWithInterpreter=NO" >> mk/build.mk
endif
+ifneq (,$(findstring $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64))
+ echo "GhcWithInterpreter=YES"
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel alpha))
+ echo "UseLibFFIForAdjustors=YES" >> mk/build.mk
+endif
ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel))
echo "SRC_HC_OPTS += -optc-mlong-calls" >> mk/build.mk
- echo "UseLibFFIForAdjustors=YES" >> mk/build.mk
endif
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
echo "SRC_HC_OPTS += -H32m -O0" >> mk/build.mk
@@ -65,6 +70,7 @@
# We can't do this with a configure flag in 6.8.1 as libdir is not
# defined at the point at which we := it
echo 'bindir := $${ghclibdir}/bin' >> mk/build.mk
+ echo 'ghclibexecdir := $${ghclibdir}/lib' >> mk/build.mk
# docdir doesn't have a configure flag, and unfortunately
# we also need to explicitly define all of its dependents as they
# are set with :=
@@ -99,6 +105,12 @@
[ "$$(debian/testghc/foo)" = "Foo" ]
rm debian/testghc/*
+# build haddock separately and hard code paths according to install paths
+ cp -r utils/haddock debian
+ cd debian/haddock; cat ../patches.haddock/series | xargs -IX cat ../patches.haddock/X | patch -p1
+ sed -i s/@PROJECTVERSION@/$(ProjectVersion)/ debian/haddock/src/Main.hs
+ cd debian/haddock; ../../inplace/bin/ghc-stage2 --make Setup.lhs; ./Setup configure --prefix=/usr --with-compiler=../../inplace/bin/ghc-stage2 --package-db=../../inplace/lib/package.conf.d/; ./Setup build
+
touch $@
FILES = \( -type f -o -type l \)
@@ -140,7 +152,7 @@
if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
cd debian/tmp/usr/lib/ghc-$(ProjectVersion) ;rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
fi
- rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock debian/tmp/usr/lib/ghc-$(ProjectVersion)/haddock
+ rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock
cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
for f in *-$(ProjectVersion); \
do ln -s /usr/lib/ghc-$(ProjectVersion)/bin/$$f \
@@ -154,6 +166,7 @@
rm -f debian/tmp/usr/bin/*-$(ProjectVersion)6
rm -f debian/tmp/usr/bin/runhaskell6
sed -i 's,topdir="/usr/lib,topdir="/var/lib,' debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/ghc-pkg-$(ProjectVersion)
+ cd debian/haddock; ./Setup copy --dest=../tmp
ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
@@ -177,6 +190,7 @@
mv debian/tmp/usr/share/man/man1/ghc.1 debian/ghc6.1
cp utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
cp debian/ghc-pkg6.man debian/ghc-pkg6.1
+ cp debian/haddock.man debian/tmp/usr/share/man/man1/haddock.1
echo debian/*.1 > debian/ghc6.manpages
@@ -195,8 +209,9 @@
echo debian/tmp/usr/share/lintian/overrides/ghc6-prof >> debian/ghc6-prof.install
# ghc6-doc
ifeq (YES,$(BUILD_HADDOCK_DOCS))
- find debian/tmp/usr/share/doc $(FILES) > debian/ghc6-doc.install
- find debian/tmp/usr/lib/ghc6-doc $(FILES) >> debian/ghc6-doc.install
+ find debian/tmp/usr/share/doc/ghc6-doc $(FILES) > debian/ghc6-doc.install
+ find debian/tmp/usr/share/haddock* $(FILES) >> debian/ghc6-doc.install
+ find debian/tmp/usr/lib/ghc6-doc $(FILES) >> debian/ghc6-doc.install
endif
sed -i s,^debian/tmp,, debian/*.install
rm -f debian/ghc6.links
@@ -219,6 +234,7 @@
$(MAKE) -f debian/scripts.mk clean
rm -rf debian/testghc
rm -f ch01.html ch02.html index.html
+ rm -rf debian/haddock
# H[...incomplete...]
More information about the Pkg-haskell-commits
mailing list