[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.8.2dfsg1-1.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:05:49 UTC 2011
Thu Jan 15 05:42:47 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.8.2dfsg1-1.dsc
M ./changelog -3 +154
M ./control -23 +7
M ./copyright -4 +4
R ./flags.xsl.in
M ./ghc6-doc.doc-base.users-guide -2 +2
A ./ghc6-doc.postinst.in
A ./ghc6-doc.prerm
M ./ghc6.postinst.in -1 +1
M ./rules -80 +112
M ./scripts.mk -2 +2
A ./watcher.sh
Thu Jan 15 05:42:47 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.8.2dfsg1-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:05:48.971355378 +0000
+++ new-ghc/changelog 2011-01-15 06:05:49.643390780 +0000
@@ -1,8 +1,159 @@
-ghc6 (6.6-3~bpo.1) sarge-backports; urgency=low
+ghc6 (6.8.2dfsg1-1) unstable; urgency=medium
- * Rebuild for Sarge.
+ * Repackaged the upstream tarball to remove a copy of GNU MP library
+ with GFDLed docs w/ invariant sections. (Closes: #511756)
- -- Sebastian Harl <sh at tokkee.org> Thu, 7 Dec 2006 13:47:15 +0100
+ -- Kari Pahula <kaol at debian.org> Thu, 15 Jan 2009 07:42:47 +0200
+
+ghc6 (6.8.2-7) unstable; urgency=medium
+
+ * Build-Depend on hurd as an alternative to procps. (Closes: #481343)
+ * Added AC_SYS_LARGEFILE to libraries/unix/configure.ac and ran
+ autoreconf. (Closes: #500407)
+
+ -- Kari Pahula <kaol at debian.org> Sun, 28 Sep 2008 10:32:20 +0300
+
+ghc6 (6.8.2-6) unstable; urgency=medium
+
+ * New maintainer.
+ * Made the perl script driver/split/ghc-split not use the obsolete $*
+ var (Closes: #489157)
+ * Copied libraries/unix/System/Posix/Resource.hsc and
+ libraries/base/include/HsBase.h from 6.8.3 to fix issues with
+ setResourceLimit. (Closes: #491909)
+
+ -- Kari Pahula <kaol at debian.org> Wed, 03 Sep 2008 23:41:18 +0300
+
+ghc6 (6.8.2-5) unstable; urgency=low
+
+ * Don't build template-haskell if we're not building GHCi.
+ The package is largely useless without GHCi, and some of the buildds
+ were having trouble building template-haskell. We'll need to fix
+ this some other way if GHCi is to be available on every arch, though...
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Thu, 01 May 2008 12:32:13 +0000
+
+ghc6 (6.8.2-4) unstable; urgency=low
+
+ * Small wibbles to debian/watcher.sh.
+ * Add a build-dep on procps (debian/watcher.sh runs ps).
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Wed, 26 Mar 2008 17:12:18 +0000
+
+ghc6 (6.8.2-3) unstable; urgency=low
+
+ * Every 10 minutes, print any "ps ux" lines that mention gcc or ghc.
+ According to folks on IRC, this is standard practice. It means that
+ we don't have to worry about security buildds having different
+ timeouts to the normal builders.
+ * Apply upstream patch:
+ FIX #2073: Don't add empty lines to GHCI's history
+ Ian Lynagh <igloo at earth.li>**20080224143256
+ Closes: #461170.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Mon, 24 Mar 2008 22:09:02 +0000
+
+ghc6 (6.8.2-2) unstable; urgency=low
+
+ * Apply upstream patch:
+ Tweak the splitter
+ Ian Lynagh <igloo at earth.li>**20080116195612
+ We were generating a label ".LnLC7", which the splitter was confusing
+ with a literal constant (LC). The end result was the assembler tripping
+ up on ".Ln.text".
+ Closes: #466262.
+ * Make an hpc symlink in /usr/bin. Closes: #461146.
+ * Add a dep and build-dep on gcc >= 4:4.2 as we need the
+ -fno-toplevel-reorder flag. Closes: #461332.
+ * Put the right upstream source URL in debian/copyright.
+ Closes: #465058.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Wed, 20 Feb 2008 17:32:52 +0000
+
+ghc6 (6.8.2-1) unstable; urgency=low
+
+ * Strengthen haddock dep and build-dep to 0.8-2 as we need the
+ version that makes compatible files on 32 and 64 bit arches.
+ Closes: #433251.
+ * Add a build-dep on hscolour. We now use it when making the
+ documentation, so the haddock docs link to syntax highlighted
+ source.
+ * Remove the libsrc package. ghc6-doc now includes the sources anyway.
+ Closes: #432706.
+ * gen_contents_index is now provided by the upstream install, so we
+ no longer ship our own copy. However, we do have to move it into
+ /usr/lib rather than /usr/share/doc.
+ * Remove the stat2resid slave of the GHC symlink, as stat2resid
+ no longer exists. Closes: #432715.
+ * We set bindir, docdir, htmldir, dvidir, pdfdir and psdir in
+ mk/build.mk rather than with configure flags, as the way configure
+ currently works means they can't be set relative to other variables
+ if set with configure flags.
+ * We no longer pass --datadir to configure; we used to use this to
+ get the docs in the right place.
+ * When doing the install step, we now use DESTDIR rather than prefix
+ to override where the files go.
+ * We now need to set HADDOCK_DOCS=YES in mk/build.mk in order to get the
+ haddock docks built.
+ * Removed "html/" from the documentation path in ghc6-doc.postinst,
+ ghc6-doc.prerm and ghc6-doc.doc-base.users-guide.
+ * Use "[ ! -f mk/config.mk ] ||" to guard "make distclean" rather than
+ ignoring all errors from it.
+ * Use ${binary:Version} rather than ${Source-Version} to specify the
+ dependency of ghc6-prof on ghc6.
+ * All the libraries now install LICENSE files, so we remove them after
+ the install step.
+ * Follow change in man path from /usr/man to /usr/share/man.
+ * lintian thinks that Cabal's Distribution/License.hi is an extra
+ licence file, so add a lintian override.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Tue, 18 Dec 2007 22:05:22 +0000
+
+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
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:05:48.971355378 +0000
+++ new-ghc/control 2011-01-15 06:05:49.643390780 +0000
@@ -1,14 +1,13 @@
Source: ghc6
Section: devel
Priority: optional
-Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
-Uploaders: Sebastian Harl <sh at tokkee.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
+Maintainer: Kari Pahula <kaol at debian.org>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, devscripts, haddock (>= 0.8-2), hscolour, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd
Package: ghc6
Architecture: any
-Depends: haskell-utils, perl | perl5, gcc, libgmp3-dev, ${shlibs:Depends}, ${misc:Depends}, ${readline}
+Depends: haskell-utils, perl | perl5, gcc (>= 4:4.2), libgmp3-dev, ${shlibs:Depends}, ${misc:Depends}, ${readline}
Provides: haskell-compiler, ghc, ${provided-devs}
Conflicts: ghc4 (<= 4.08.1-4)
Suggests: ghc6-prof, ghc6-doc, haskell-doc
@@ -26,7 +25,7 @@
Section: devel
Architecture: any
Provides: ghc-prof, ${provided-profs}
-Depends: ghc6 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ghc6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Profiling libraries for the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
@@ -45,6 +44,8 @@
Section: doc
Architecture: all
Suggests: haskell-doc
+Provides: ${provided-docs}
+Depends: haddock (>= 0.8-2), ${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.
@@ -58,20 +59,3 @@
This package includes HTML, DVI and PS versions of the SGML-based
documentation around GHC.
-Package: ghc6-libsrc
-Section: doc
-Suggests: ghc6-doc, haskell-doc
-Architecture: all
-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.
- .
- Haskell is "the" standard lazy functional programming language. Haskell98
- is the current version of the language. The language definition and
- additional documentation can be found in the `haskell-doc' package.
- Alternatively, there is an online version at
- http://haskell.org/onlinereport/.
- .
- This package contains the Haskell source code of the GHC libraries. It is
- provided as additional documentation ("Use the source, Luke").
-
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright 2011-01-15 06:05:48.967355167 +0000
+++ new-ghc/copyright 2011-01-15 06:05:49.643390780 +0000
@@ -4,7 +4,7 @@
released into the public domain.
It was downloaded from
-http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src.tar.bz2
+http://www.haskell.org/ghc/dist/6.8.2/ghc-6.8.2-src.tar.bz2
Upstream Authors: The GHC team
Simon Peyton Jones <simonpj at microsoft.com>
@@ -23,14 +23,14 @@
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,
+* 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,
+* 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.
-· Neither name of the University nor the names of its contributors may be
+* Neither name of the University nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
diff -rN -u old-ghc/flags.xsl.in new-ghc/flags.xsl.in
--- old-ghc/flags.xsl.in 2011-01-15 06:05:48.967355167 +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/ghc6-doc.doc-base.users-guide new-ghc/ghc6-doc.doc-base.users-guide
--- old-ghc/ghc6-doc.doc-base.users-guide 2011-01-15 06:05:48.967355167 +0000
+++ new-ghc/ghc6-doc.doc-base.users-guide 2011-01-15 06:05:49.643390780 +0000
@@ -12,5 +12,5 @@
Section: devel
Format: HTML
-Index: /usr/share/doc/ghc6-doc/html/index.html
-Files: /usr/share/doc/ghc6-doc/html/*/*.html
+Index: /usr/share/doc/ghc6-doc/index.html
+Files: /usr/share/doc/ghc6-doc/*/*.html
diff -rN -u old-ghc/ghc6-doc.postinst.in new-ghc/ghc6-doc.postinst.in
--- old-ghc/ghc6-doc.postinst.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.postinst.in 2011-01-15 06:05:49.643390780 +0000
@@ -0,0 +1,41 @@
+#! /bin/sh
+# postinst script for ghc6-doc
+#
+set -e
+
+libdir=/usr/lib/ghc6-doc
+
+# 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/
+#
+# q[...incomplete...]
More information about the Pkg-haskell-commits
mailing list