[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.8.2-7.dsc
Kari Pahula
kaol at debian.org
Sat Jul 30 14:51:32 UTC 2011
Sun Sep 28 07:32:20 UTC 2008 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.8.2-7.dsc
M ./changelog +104
M ./control -24 +6
M ./copyright -4 +4
R ./gen_contents_index
M ./ghc6-doc.doc-base.users-guide -2 +2
R ./ghc6-doc.postinst
A ./ghc6-doc.postinst.in
M ./ghc6-doc.prerm -8 +8
M ./ghc6.postinst.in -1 +1
M ./rules -23 +43
M ./scripts.mk -1 +2
A ./watcher.sh
Sun Sep 28 07:32:20 UTC 2008 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.8.2-7.dsc
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog 2011-07-30 14:51:10.102030850 +0000
+++ new-ghc//changelog 2011-07-30 14:51:31.949059155 +0000
@@ -1,3 +1,107 @@
+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
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control 2011-07-30 14:51:10.094198639 +0000
+++ new-ghc//control 2011-07-30 14:51:31.933057769 +0000
@@ -1,13 +1,13 @@
Source: ghc6
Section: devel
Priority: optional
-Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
-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
+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
@@ -25,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,7 +45,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
-Depends: haddock, ${shlibs:Depends}, ${misc:Depends}
+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.
@@ -59,21 +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
-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.
- .
- 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-07-30 14:51:10.068669559 +0000
+++ new-ghc//copyright 2011-07-30 14:51:31.901058789 +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//gen_contents_index new-ghc//gen_contents_index
--- old-ghc//gen_contents_index 2011-07-30 14:51:10.046207060 +0000
+++ new-ghc//gen_contents_index 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#!/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.doc-base.users-guide new-ghc//ghc6-doc.doc-base.users-guide
--- old-ghc//ghc6-doc.doc-base.users-guide 2011-07-30 14:51:10.046207060 +0000
+++ new-ghc//ghc6-doc.doc-base.users-guide 2011-07-30 14:51:31.889059592 +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 new-ghc//ghc6-doc.postinst
--- old-ghc//ghc6-doc.postinst 2011-07-30 14:51:10.046207060 +0000
+++ new-ghc//ghc6-doc.postinst 1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-#! /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.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-07-30 14:51:31.889059592 +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/
+#
+# 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/libraries
+ "$libdir"/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 2011-07-30 14:51:10.042058381 +0000
+++ new-ghc//ghc6-doc.prerm 2011-07-30 14:51:31.889059592 +0000
@@ -16,14 +16,14 @@
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
+ rm -f /usr/share/doc/ghc6-doc/libraries/doc-index*.html
+ rm -f /usr/share/doc/ghc6-doc/libraries/haddock.css
+ rm -f /usr/share/doc/ghc6-doc/libraries/haddock.js
+ rm -f /usr/share/doc/ghc6-doc/libraries/index.html
+ rm -f /usr/share/doc/ghc6-doc/libraries/libraries.txt
+ rm -f /usr/share/doc/ghc6-doc/libraries/haskell_icon.gif
+ rm -f /usr/share/doc/ghc6-doc/libraries/minus.gif
+ rm -f /usr/share/doc/ghc6-doc/libraries/plus.gif
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -rN -u old-ghc//ghc6.postinst.in new-ghc//ghc6.postinst.in
--- old-ghc//ghc6.postinst.in 2011-07-30 14:51:10.030058625 +0000
+++ new-ghc//ghc6.postinst.in 2011-07-30 14:51:31.873058851 +0000
@@ -41,10 +41,10 @@
--slave $execdir/ghci ghci $bindir/ghci \
--slave $execdir/hsc2hs hsc2hs $bindir/hsc2hs \
--slave $execdir/hp2ps hp2ps $bindir/hp2ps \
+ --slave $execdir/hpc hpc $bindir/hpc \
--slave $mandir/man1/hp2ps.1.gz hp2ps.1.gz $mandir/man1/hp2ps-ghc6.1.gz \
--slave $mandir/man1/ghc.1.gz ghc.1.gz $mandir/man1/ghc6.1.gz \
--slave $mandir/man1/ghci.1.gz ghci.1.gz $mandir/man1/ghc6.1.gz \
- --slave $execdir/stat2resid stat2resid $bindir/stat2resid \
--slave $execdir/hasktags hasktags $bindir/hasktags
if [ ! -e $libdir/package.conf ]
then
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules 2011-07-30 14:51:10.026056940 +0000
+++ new-ghc//rules 2011-07-30 14:51:31.865058069 +0000
@@ -30,6 +30,7 @@
rm -f mk/build.mk
echo "XMLDocWays := html" >> mk/build.mk
+ echo "HADDOCK_DOCS := YES" >> mk/build.mk
echo "GhcRTSWays += debug_p thr_debug thr_debug_p" >> mk/build.mk
echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
@@ -55,17 +56,29 @@
# echo "GhcLibHcOpts += -O0" >> mk/build.mk
echo "GhcRtsCcOpts += -O0" >> mk/build.mk
endif
+ # 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 := $${libdir}/bin' >> 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 :=
+ echo 'docdir := $$(datarootdir)/doc/ghc6-doc' >> mk/build.mk
+ echo 'htmldir := $$(docdir)' >> mk/build.mk
+ echo 'dvidir := $$(docdir)' >> mk/build.mk
+ echo 'pdfdir := $$(docdir)' >> mk/build.mk
+ echo 'psdir := $$(docdir)' >> mk/build.mk
rm -f config.sub
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' --datadir='$${prefix}/share/doc/ghc6-doc' $(EXTRA_CONFIGURE_FLAGS)
+ ./configure $(confflags) --prefix=/usr $(EXTRA_CONFIGURE_FLAGS)
touch $@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
+ sh debian/watcher.sh "$$PPID" "`pwd`" "`pwd`/build-stamp" 'ghc\|gcc' &
$(MAKE)
# Do some very simple tests that the compiler actually works
@@ -95,8 +108,16 @@
echo "readline=`grep-status -r -FProvides '\<libreadline-dev\>' -a -FStatus installed -s Package -n | tr '\n' ,`" >> debian/ghc6.substvars
# Install the basic stuff
- $(MAKE) prefix=`pwd`/debian/tmp/usr install
- $(MAKE) prefix=`pwd`/debian/tmp/usr install-docs
+ $(MAKE) DESTDIR=`pwd`/debian/tmp install
+ $(MAKE) DESTDIR=`pwd`/debian/tmp install-docs
+
+ # Delete all the library LICENSE files
+ rm debian/tmp/usr/share/doc/ghc6-doc/libraries/*/LICENSE
+
+ # Generate lintian overrides
+ mkdir -p debian/tmp/usr/share/lintian/overrides
+ echo "ghc6 binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/lib/Cabal-*/Distribution/License.hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6
+ echo "ghc6-prof binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/lib/Cabal-*/Distribution/License.p_hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6-prof
# Sort out the package.conf files
mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf \
@@ -126,17 +147,15 @@
done
rm -f debian/tmp/usr/bin/*-$(ProjectVersion)6
rm -f debian/tmp/usr/bin/runhaskell6
-
- # library documentation
- chmod +x debian/gen_contents_index
-
- # library source
- ln -s ../../../../../libraries debian/tmp/usr/share/doc/ghc6-libsrc
+ # gen_contents_index is a script, so move it into /usr/lib
+ mkdir debian/tmp/usr/lib/ghc6-doc
+ mv debian/tmp/usr/share/doc/ghc6-doc/libraries/gen_contents_index \
+ debian/tmp/usr/lib/ghc6-doc
# manpages
ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
for m in ghci6 ghc-$(ProjectVersion) ghci-$(ProjectVersion); do echo ".so man1/ghc6.1" > debian/$$m.1; done
- mv debian/tmp/usr/man/man1/ghc.1 debian/ghc6.1
+ mv debian/tmp/usr/share/man/man1/ghc.1 debian/ghc6.1
cp utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
echo debian/*.1 > debian/ghc6.manpages
@@ -150,18 +169,18 @@
# Now all the files are sorted, create the package filelists
# ghc6
- find debian/tmp/usr/bin $(FILES) [...incomplete...]
More information about the Pkg-haskell-commits
mailing list