[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.6.1-2.dsc

Ian Lynagh (wibble) igloo at debian.org
Sat Jul 30 14:50:02 UTC 2011


Tue May 15 14:12:53 UTC 2007  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.6.1-2.dsc

    M ./changelog +46
    M ./control -2 +5
    R ./flags.xsl.in
    A ./gen_contents_index
    A ./ghc6-doc.postinst
    A ./ghc6-doc.prerm
    M ./rules -78 +90
    M ./scripts.mk -2 +1

Tue May 15 14:12:53 UTC 2007  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.6.1-2.dsc
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-07-30 14:49:35.638182882 +0000
+++ new-ghc//changelog	2011-07-30 14:50:02.310056291 +0000
@@ -1,3 +1,49 @@
+ghc6 (6.6.1-2) unstable; urgency=low
+
+  * ghc6-doc now depends on haddock as it needs to run
+    gen_contents_index in postinst. Closes: #423561.
+  * ghc6-doc and ghc6-libsrc depend on ${shlibs:Depends}, ${misc:Depends}.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org>  Tue, 15 May 2007 14:12:53 +0000
+
+ghc6 (6.6.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Policy 3.7.2 compliant.
+  * ghc6-doc provides libghc6-PACKAGE-doc for the various packages it
+    has docs for.
+  * Tweaked debian/rules to handle changes.
+  * Remove build-dep on xutils; we no longer use lndir (which has now
+    moved to xutils-dev anyway!)
+  * Remove build-dep on cpio; we now let dh_install do all the moving
+    rather than doing it ourselves with cpio.
+  * Remove build-dep on time; no longer used.
+  * Remove build-deps on libx11-dev, libsm-dev, libice-dev, libxmu-dev,
+    libxi-dev; the X11 stuff is now in separate Cabal packages.
+  * Manpages generation script removed s it is now in upstream.
+  * Pass --datadir to ./configure rather than "make install-docs"
+    so the haddock fields in package.conf get set correctly.
+    Closes: #417325.
+  * In mk/config.mk.in, don't put ghc-6.6.1/ on the end of datadir.
+  * Use $(INSTALL) rather than hardcoding /usr/bin/install everywhere.
+  * Don't generate or install library HTML doc contents and index.
+  * Do install libraries-footer.txt, libraries-header.txt and the various
+    prologue.txt's.
+  * Install a gen_contents_index script for generating the haddock
+    contents and index.
+  * Add -X.haddock to the dh_compress call to make sure the .haddock
+    files aren't getting compressed.
+  * Give ghc6-doc a postinst to generate the haddock contents and index
+    when it is installed.
+  * Give ghc6-doc a prerm to clean up the above.
+  * Revert these earlier changes as we now have haddock 0.8:
+    * Remove the --source-module argument to haddock in mk/package.mk
+      as haddock 0.7 doesn't support it.
+    * Re-add the -optP-P when generating .raw-hs files as haddock 0.7
+      doesn't cope with line numbers in the files.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org>  Sun, 29 Apr 2007 00:47:00 +0100
+
 ghc6 (6.6-3) unstable; urgency=low
 
   * Add arm to the list of arches that have ghc6.
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2011-07-30 14:49:35.638182882 +0000
+++ new-ghc//control	2011-07-30 14:50:02.310056291 +0000
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
-Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, time, xutils, devscripts, haddock (>= 0.6), ghc6, cpio, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, devscripts, haddock (>= 0.6), ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml
 
 Package: ghc6
 Architecture: any
@@ -44,6 +44,8 @@
 Section: doc
 Architecture: all
 Suggests: haskell-doc
+Provides: ${provided-docs}
+Depends: haddock, ${shlibs:Depends}, ${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.
@@ -61,6 +63,7 @@
 Section: doc
 Suggests: ghc6-doc, haskell-doc
 Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Library Sources of GHC, 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//flags.xsl.in new-ghc//flags.xsl.in
--- old-ghc//flags.xsl.in	2011-07-30 14:49:35.618263365 +0000
+++ new-ghc//flags.xsl.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE xsl:stylesheet [
-]>
-
-<xsl:stylesheet version="1.0"
-		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns="http://www.w3.org/TR/xhtml1/strict">
-				  
-<xsl:output method="text" omit-xml-declaration="yes" />
-
-<xsl:template match="/">.\"
-.\" This is a generated file.  Changes might get clobbered.  Edit at own's risk.
-.\"
-.TH GHC 1 "2002-10-25" "Glasgow FP Suite" "Glasgow Haskell Compiler"
-.SH NAME
-GHC \- the Glasgow Haskell Compiler
-
-
-.SH SYNOPSIS
-.B ghc
-.RI [ option | filename ]...
-.br
-.B ghci
-.RI [ option | filename ]...
-.br
-.B ghc6
-.RI [ option | filename ]...
-.br
-.B ghci6
-.RI [ option | filename ]...
-
-.SH DESCRIPTION
-This manual page documents briefly the
-.B ghc
-and
-.B ghci
-commands.
-Note that
-.B ghci
-is not yet available on all architectures.
-Extensive documentation is available in various other formats
-including DVI, PostScript and HTML; see below.
-
-.PP
-Each of GHC's command line options is classified as either 
-.IR static " or " dynamic .
-A static flag may only be specified on the command line, whereas a
-dynamic flag may also be given in an \f(CROPTIONS\fP pragma in a
-source file or set from the GHCi command-line with \f(CR:set\fP.
-
-As a rule of thumb, all the language options are dynamic, as are the
-warning options and the debugging options.
-
-The rest are static, with the notable exceptions of
-.BR \-v ", " \-cpp ", " \-fasm ", " \-fvia\-C ", and " \-#include .
-The OPTIONS sections lists the status of each flag.
-
-.PP
-Common suffixes of file names for Haskell are:
-.TP
-.B .hs
-Haskell source code; preprocess, compile
-.TP
-.B .lhs
-literate Haskell source; unlit, preprocess, compile
-.TP
-.B .hi
-Interface file; contains information about exported
-symbols
-.TP
-.B .hc
-intermediate C files
-.TP
-.BI . x _o
-way 
-.I x 
-object files; common ways are:
-.BR p ", " u ", " s
-.TP
-.BI . x _hi
-way 
-.I x
-interface files
-
-
-.SH OPTIONS
-
-<xsl:apply-templates select="sect1/sect2" mode="overview"/>
-
-<xsl:apply-templates select="sect1/sect2"/>
-
-
-.SH FILES
-.I /usr/lib/ghc- at VERSION@/
-
-.SH COPYRIGHT
-
-Copyright 2002, The University Court of the University of Glasgow.
-.br
-All rights reserved.
-
-
-.SH AUTHOR
-
-This manual page was generated from the XML documentation of GHC with blood,
-sweat, tears and a breaks-if-you-look-at-it-the-wrong-way XSL
-stylesheet by Michael Weber <michaelw at debian.org> for the Debian
-GNU/Linux system (but may be used by others).
-
-.\" End
-</xsl:template>
-
-
-<xsl:template match="sect1/sect2" mode="overview">
-<xsl:choose>
-<xsl:when test="contains(title/.,' (')">
-.SS <xsl:value-of select="substring-before(title/.,' (')"/>
-</xsl:when>
-<xsl:otherwise>
-.SS <xsl:value-of select="title/."/>
-</xsl:otherwise>
-</xsl:choose>
-.nh
-<xsl:apply-templates select="informaltable/tgroup/tbody/row" mode="overview"/>
-.hy
-</xsl:template>
-
-
-<xsl:template match="sect1/sect2">
-<xsl:choose>
-<xsl:when test="contains(title/.,' (')">
-
-.SH <xsl:value-of select='translate(substring-before(title/.," ("),"abcdefghijklmnopqrstuvwxyz","ABCDEFGHIJKLMNOPQRSTUVWXYZ")'/>
-
-</xsl:when>
-<xsl:otherwise>
-
-.SH <xsl:value-of select='translate(title/.,"abcdefghijklmnopqrstuvwxyz","ABCDEFGHIJKLMNOPQRSTUVWXYZ")'/>
-
-</xsl:otherwise>
-</xsl:choose><xsl:text>
-</xsl:text>
-<xsl:apply-templates select="informaltable/tgroup/tbody/row"/>
-</xsl:template>
-
-
-<xsl:template match="informaltable/tgroup/tbody/row" mode="overview">
-  <xsl:apply-templates select="entry[1]|entry[4]" mode="overview"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="informaltable/tgroup/tbody/row">
-.TP
-<xsl:apply-templates select="entry[1]"/><xsl:text>
-</xsl:text>
-<xsl:variable name="x">
-<xsl:apply-templates select="entry[2]"/>
-</xsl:variable>
-<xsl:value-of select="normalize-space($x)"/>
-.rj
-[<xsl:apply-templates select="entry[3]"/>]
-<!-- IGNORE NEGATIVE OPTIONS
-<xsl:if test="not(entry[4]='-')">
-  <xsl:text>.TP
-</xsl:text>
-  <xsl:apply-templates select="entry[4]/option"/>
-</xsl:if>
- -->
-</xsl:template>
-
-
-<xsl:template match="option" mode="escape-dash">
-  <xsl:variable name="x">
-    <xsl:value-of select="."/>
-  </xsl:variable>
-  <xsl:variable name="y">
-    <xsl:call-template name="replace-string">
-      <xsl:with-param name="text" select="$x"/>
-      <xsl:with-param name="from" select="'-'"/>
-      <xsl:with-param name="to" select="'\-'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="$y"/>
-</xsl:template>
-
-<xsl:template match="option" mode="overview">
-  <xsl:apply-templates select="." mode="escape-dash"/>
-</xsl:template>
-
-<xsl:template match="option">
-  <xsl:text>\fB</xsl:text>
-  <xsl:apply-templates select="." mode="escape-dash"/>
-  <xsl:text>\fP</xsl:text>
-</xsl:template>
-
-
-<xsl:template match="entry[1]" mode="overview">
-  <xsl:apply-templates mode="overview"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="entry[1]">
-  <xsl:apply-templates/><xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="entry[4]" mode="overview">
-  <xsl:if test="not(.='-')">
-    <xsl:apply-templates select="option" mode="overview"/>
-    <xsl:text> </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="entry[4]">
-  <xsl:if test="not(.='-')">
-    <xsl:value-of select="."/><xsl:text> </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-
-<xsl:template match="replaceable" mode="overview">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="replaceable">
-  <xsl:text>\fI</xsl:text>
-  <xsl:value-of select='.'/>
-  <xsl:text>\fP</xsl:text>
-</xsl:template>
-
-
-<xsl:template match="literal">
-  <xsl:text>\f(CR</xsl:text>
-  <xsl:value-of select="."/>
-  <xsl:text>\fP</xsl:text>
-</xsl:template>
-
-
-
-<!-- reusable replace-string function -->
-  <xsl:template name="replace-string">
-     <xsl:param name="text"/>
-     <xsl:param name="from"/>
-     <xsl:param name="to"/>
-
-     <xsl:choose>
-       <xsl:when test="contains($text, $from)">
-
-         <xsl:variable name="before" select="substring-before($text,
-	 $from)"/>
-         <xsl:variable name="after" select="substring-after($text,
-	 $from)"/>
-         <xsl:variable name="prefix" select="concat($before, $to)"/>
-
-         <xsl:value-of select="$before"/>
-         <xsl:value-of select="$to"/>
-         <xsl:call-template name="replace-string">
-           <xsl:with-param name="text" select="$after"/>
-           <xsl:with-param name="from" select="$from"/>
-           <xsl:with-param name="to" select="$to"/>
-         </xsl:call-template>
-       </xsl:when> 
-       <xsl:otherwise>
-         <xsl:value-of select="$text"/>  
-       </xsl:otherwise>
-     </xsl:choose>            
-  </xsl:template>
-
-
-</xsl:stylesheet>
diff -rN -u old-ghc//gen_contents_index new-ghc//gen_contents_index
--- old-ghc//gen_contents_index	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//gen_contents_index	2011-07-30 14:50:02.262086292 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+HADDOCK_FILES=`ls -1 */*.haddock | sort`
+
+# Automagically create the prologue for the combined index via a
+# header, the package prologues (in alphabetical order of the
+# packages) and a footer.
+{
+    cat libraries-header.txt
+    echo
+    # Hack to find out if we're in a build tree or installed docs
+    for HADDOCK_FILE in $HADDOCK_FILES
+    do
+        NAME=`echo "$HADDOCK_FILE" | sed "s#/.*##"`
+        PROLOGUE="$NAME"/prologue.txt
+        if [ "$NAME" != haskell98 ]
+        then
+            echo "[@${NAME}@]"
+            if [ -e "$PROLOGUE" ]
+            then
+                grep -v '^ *$$' "$PROLOGUE"
+            fi
+            echo
+            HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
+        fi
+    done
+    cat libraries-footer.txt
+    echo
+} > libraries.txt
+
+# Now create the combined contents and index pages
+haddock --gen-index --gen-contents -o . \
+        -t "Haskell Hierarchical Libraries" \
+        -p libraries.txt \
+        $HADDOCK_ARGS
+
diff -rN -u old-ghc//ghc6-doc.postinst new-ghc//ghc6-doc.postinst
--- old-ghc//ghc6-doc.postinst	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//ghc6-doc.postinst	2011-07-30 14:50:02.262086292 +0000
@@ -0,0 +1,39 @@
+#! /bin/sh
+# postinst script for ghc6-doc
+#
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure|abort-upgrade|abort-remove|abort-deconfigure)
+        cd /usr/share/doc/ghc6-doc/html/libraries
+        /usr/lib/ghc6-doc/gen_contents_index
+    ;;
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -rN -u old-ghc//ghc6-doc.prerm new-ghc//ghc6-doc.prerm
--- old-ghc//ghc6-doc.prerm	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//ghc6-doc.prerm	2011-07-30 14:50:02.258110668 +0000
@@ -0,0 +1,40 @@
+#! /bin/sh
+# prerm script for ghc6-doc
+#
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure|failed-upgrade)
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/doc-index*.html
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/haddock.css
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/haddock.js
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/index.html
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/libraries.txt
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/haskell_icon.gif
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/minus.gif
+        rm -f /usr/share/doc/ghc6-doc/html/libraries/plus.gif
+    ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2011-07-30 14:49:35.594079780 +0000
+++ new-ghc//rules	2011-07-30 14:50:02.250278839 +0000
@@ -8,9 +8,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 # From /usr/share/doc/autotools-dev/examples/rules.gz:
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -25,10 +22,8 @@
 GHC=$(firstword $(shell bash -c "type -p ghc6 ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
 
-VARFILE=/usr/lib/haskell-utils/ghc6_vars
-
-build: build-stamp
-build-stamp:
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 
 	touch configure
@@ -64,35 +59,34 @@
 	rm -f config.guess
 	ln -s /usr/share/misc/config.sub .
 	ln -s /usr/share/misc/config.guess .
-	./configure $(confflags) --prefix=/usr --bindir='$${libdir}/bin' $(EXTRA_CONFIGURE_FLAGS)
+	./configure $(confflags) --prefix=/usr --bindir='$${libdir}/bin' --datadir='$${prefix}/share/doc/ghc6-doc' $(EXTRA_CONFIGURE_FLAGS)
+
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
 	$(MAKE)
 
-	rm -rf debian/test-build
-	mkdir debian/test-build
-	echo 'main = putStrLn "Foo"' > debian/test-build/foo.hs
-	compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo
-	[ "$$(debian/test-build/foo)" = "Foo" ]
-	rm debian/test-build/*
-	echo 'main = putStrLn "Foo"' > debian/test-build/foo.hs
-	compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo -O2
-	[ "$$(debian/test-build/foo)" = "Foo" ]
-	rm debian/test-build/*
+	# Do some very simple tests that the compiler actually works
+	rm -rf debian/testghc
+	mkdir debian/testghc
+	echo 'main = putStrLn "Foo"' > debian/testghc/foo.hs
+	compiler/stage2/ghc-inplace debian/testghc/foo.hs -o debian/testghc/foo
+	[ "$$(debian/testghc/foo)" = "Foo" ]
+	rm debian/testghc/*
+	echo 'main = putStrLn "Foo"' > debian/testghc/foo.hs
+	compiler/stage2/ghc-inplace debian/testghc/foo.hs -o debian/testghc/foo -O2
+	[ "$$(debian/testghc/foo)" = "Foo" ]
+	rm debian/testghc/*
 
-	ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
-	# Put some entities before the <?xml tag and then manpagify flags.xml
-	{ head -1 docs/users_guide/flags.xml; \
-	  echo "<!DOCTYPE sect1 [<!ENTITY ndash  \"-\"> \
-	                         <!ENTITY ldquo  \"\`\"> \
-	                         <!ENTITY rdquo  \"'\">]>"; \
-	  tail -n +2 docs/users_guide/flags.xml; } \
-	      | xsltproc debian/flags.xsl - > debian/ghc6.1
-	for m in ghci6 ghc-$(ProjectVersion) ghci-$(ProjectVersion); do echo ".so man1/ghc6.1" > debian/$$m.1; done
-	cp utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
-	echo debian/*.1 > debian/ghc6.manpages
+	touch $@
 
-	touch build-stamp
+FILES = \( -type f -o -type l \)
+PROF_FILE = \( -name "*.p_*" -o -name "lib*_p.a" \)
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -102,59 +96,79 @@
 
 	# Install the basic stuff
 	$(MAKE) prefix=`pwd`/debian/tmp/usr install
-	$(MAKE) prefix=`pwd`/debian/ghc6-doc/usr \
-	    datadir='$${prefix}/share/doc/ghc6-doc' install-docs
-	cd libraries && find . \( -type f -o -type l \) \
-	                       \( -name "*.hs" -o -name "*.lhs" \) -print0 \
-	    | cpio -updV0 ../debian/ghc6-libsrc/usr/share/doc/ghc6-libsrc
-
-	# Put all the profiling files in ghc6-prof
-	find debian/tmp \( -type f -o -type l \) \
-	                \( -name "*.p_hi" -o -name "*_p.a" \) \
-	    > debian/ghc6-prof.install
-	# Take anything left and put it in ghc6 itself
-	{ find debian/tmp -type f -o -type l ; \
-	  cat debian/ghc6-prof.install; \
-	  cat debian/ghc6-prof.install; } \
-	    | sort | uniq -u > debian/ghc6.install
-	dh_install
-	/usr/bin/install -c -m 755 -d debian/ghc6/usr/bin
+	$(MAKE) prefix=`pwd`/debian/tmp/usr install-docs
 
 	# Sort out the package.conf files
-	mv debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf \
-	   debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped
-	PACKAGE=`utils/ghc-pkg/ghc-pkg-inplace list -f debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped | perl -ne 'print if $$foo; $$foo = 1 if /^debian/' | tr '\n,A-Z' '  a-z' | sed -e "s/([^)]*)//g" -e "s/-[0-9]\+\(\.[0-9]\+\)*//g" -e "s/^ *//" -e "s/ *$$//" -e "s/  */, /g"`; \
+	mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf \
+	   debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped
+	PACKAGE=`utils/g[...incomplete...]



More information about the Pkg-haskell-commits mailing list