[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.3-1.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:06:23 UTC 2011
Mon May 18 19:18:18 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.3-1.dsc
M ./changelog +36
M ./compat -1 +1
M ./control -9 +7
M ./copyright -1 +85
A ./gen_contents_index.in
A ./ghc-pkg6.man
M ./ghc6-doc.postinst.in -30 +1
A ./ghc6-doc.postrm.in
A ./ghc6-doc.preinst.in
R ./ghc6-doc.triggers
A ./ghc6-doc.triggers.in
A ./ghc6.dirs
A ./ghc6.links
M ./ghc6.postinst.in -9 +18
M ./ghc6.postrm.in -5 +4
A ./ghc6.preinst
A ./ghc6.preinst.in
M ./ghc6.prerm.in -2 +2
M ./mk_provided_substvars -1 +1
M ./patches/ghc_binary_int32 -16 +16
A ./patches/no_gen_contents_index
M ./patches/series -2 +1
M ./patches/system-libffi -16 +18
A ./provided_substvars
M ./rules -15 +50
A ./runghc.man
M ./scripts.mk -1 +2
Mon May 18 19:18:18 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.3-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/changelog 2011-01-15 06:06:22.981146975 +0000
@@ -1,3 +1,39 @@
+ghc6 (6.10.3-1) unstable; urgency=low
+
+ * New upstream release
+ * GHCi uses stdio in blocking mode now. (Closes: #512762)
+ * GHC can cope with missing setitimer(ITIMER_VIRTUAL) support.
+ (Closes: #509252)
+ * Uses haskeline instead of editline.
+ * Only provide ghci and runghc on archs that support it.
+ (Closes: #320335)
+ * Patched compiler/utils/Binary.hs to store Ints as Int64s on 32 bit
+ architectures and warn if it needed to truncate when unserialising.
+ * Moved package.conf to /var/lib/ghc-$VERSION/.
+ * Added a /var/lib/ghc-$VERSION/package.conf.d/ dir.
+ * Set symlinks from /usr/lib/ghc-$VERSION/package.conf* to /var.
+ * Don't ship generated index files in /usr/share/doc/ghc6-doc/libraries/
+ and remove them in postrm. (Closes: #501188)
+ * Remove any leftover index.html files in
+ /usr/share/doc/ghc6-doc/html/libraries/. (Closes: #461323)
+ * Bumped to debhelper compat 7 and Standards-Version 3.8.1 (no changes
+ needed).
+ * Section: haskell for ghc6 and ghc6-prof.
+ * Fix up generated Provides for ghc6 and ghc6-doc.
+ (Closes: #514085, #518400)
+ * Added man pages for runghc and ghc-pkg. (Closes: #460425, #315763)
+ * Removed alternative for /usr/bin/ghcprof. (Closes: #527382)
+ * Build a registerised build on powerpc. (Closes: #514946)
+ * Build-depend on a newer binutils on [arm armel]. Add -mlong-calls to
+ gcc's flags.
+ * gen_contents_index reintroduced, this time as a perl script.
+ * Added /usr/share/ghc6-doc/ghc-$VERSION/desc/ for copies of package
+ conf info in -doc packages.
+ * Added a preinst for ghc6, to remove a package.conf file from a removed
+ but not purged old version.
+
+ -- Kari Pahula <kaol at debian.org> Mon, 18 May 2009 22:18:18 +0300
+
ghc6 (6.10.1+dfsg1-13) unstable; urgency=low
* Haddock again just a B-D-I, now with (>= 2.4.1-4).
diff -rN -u old-ghc/compat new-ghc/compat
--- old-ghc/compat 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/compat 2011-01-15 06:06:22.977146765 +0000
@@ -1 +1 @@
-4
+7
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/control 2011-01-15 06:06:22.977146765 +0000
@@ -1,15 +1,15 @@
Source: ghc6
-Section: devel
+Section: haskell
Priority: optional
Maintainer: Kari Pahula <kaol at debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4), libgmp3-dev, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml
-Build-Depends-Indep: haddock (>= 2.4.1-4)
-Homepage: http://haskell.org/
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), libgmp3-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml, binutils (>= 2.19.51.20090508) [arm armel]
+Build-Depends-Indep: haddock (>= 2.4.2)
+Homepage: http://haskell.org/ghc/
Package: ghc6
Architecture: any
-Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, ${shlibs:Depends}, ${misc:Depends}, libedit-dev
+Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, ${shlibs:Depends}, ${misc:Depends}
Provides: haskell-compiler, ghc, ${provided-devs}
Conflicts: ghc4 (<= 4.08.1-4)
Suggests: ghc6-prof, ghc6-doc, haskell-doc
@@ -24,7 +24,6 @@
http://haskell.org/onlinereport/.
Package: ghc6-prof
-Section: devel
Architecture: any
Provides: ghc-prof, ${provided-profs}
Depends: ghc6 (= ${binary:Version}), ${misc:Depends}
@@ -47,7 +46,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
-Depends: haddock (>= 2.4.1-4), ${misc:Depends}
+Depends: haddock (>= 2.4.2), ${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.
@@ -60,4 +59,3 @@
.
This package includes HTML, DVI and PS versions of the SGML-based
documentation around GHC.
-
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/copyright 2011-01-15 06:06:22.977146765 +0000
@@ -17,7 +17,7 @@
The Glasgow Haskell Compiler License
-Copyright 2002-2008, The University Court of the University of Glasgow.
+Copyright 2002-2009, The University Court of the University of Glasgow.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -70,3 +70,87 @@
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+GHC includes mtl.
+Copyright: The University of Glasgow 2001,
+ Jeff Newbern 2003-2007,
+ Andriy Palamarchuk 2006-2007,
+ Michael Weber <michael.weber at post.rwth-aachen.de> 2001,
+ Andy Gill 2001,
+ Oregon Graduate Institute of Science and Technology, 2001
+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.
+
+- 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.
+
+THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
+GLASGOW AND THE CONTRIBUTORS "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
+UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS 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.
+
+
+GHC includes haskeline and terminfo Haskell bindings.
+Copyright: Judah Jacobson, 2007-2009
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistribution of source code must retain the above copyright notice,
+this list of conditions and the following disclamer.
+
+- Redistribution in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclamer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "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 AUTHOR OR THE CONTRIBUTORS 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.
+
+
+GHC includes utf8-string
+Copyright: Galois Inc, 2007.
+* 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.
+* * Neither the name of Galois Inc. nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY Galois Inc. ``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 Galois Inc. 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.
diff -rN -u old-ghc/gen_contents_index.in new-ghc/gen_contents_index.in
--- old-ghc/gen_contents_index.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/gen_contents_index.in 2011-01-15 06:06:22.981146975 +0000
@@ -0,0 +1,69 @@
+#! /usr/bin/perl
+# gen_contents_index, written for Debian by Kari Pahula
+# Copyright 2009 Kari Pahula
+# Licensed under BSD3, see /usr/share/common-licenses/BSD
+
+my $pkgdir = '/usr/share/ghc6-doc/ghc- at VERSION@/desc/';
+my @ifaces;
+my %pkgs;
+
+# First, add everything from the global Cabal registry to index.
+open CABAL, 'ghc-pkg6 dump --global |' or die "ghc-pkg dump failed: $!";
+addInfo (\*CABAL, \%pkgs, \@ifaces);
+close CABAL;
+
+# Then, add -doc packages that aren't registered but have the
+# corresponding data installed otherwise.
+opendir PKGS, $pkgdir;
+while ($_ = readdir PKGS) {
+ next if /^[.]/;
+ open DESC, $pkgdir.$_;
+ addInfo(\*DESC, \%pkgs, \@ifaces);
+ close DESC;
+}
+closedir PKGS;
+
+exec ('haddock', '--gen-index', '--gen-contents',
+ '-o', '/usr/share/doc/ghc6-doc/libraries/',
+ '-t'. 'Haskell Hierarchical Libraries',
+ '-p', '/usr/share/doc/ghc6-doc/libraries/prologue.txt',
+ @ifaces);
+
+sub addInfo {
+ my $fh = shift;
+ my %dat;
+ while (<$fh>) {
+ if (/^name: (.*)/) {
+ $dat{pkg} = $1;
+ } elsif (/^version: (.*)/) {
+ $dat{ver} = $1;
+ } elsif (/^haddock-interfaces: (.*)/) {
+ $dat{ifaces} = $1;
+ } elsif (/^haddock-html: (.*)/) {
+ $dat{html} = $1;
+ } elsif (/^---/) {
+ process(\%dat, @_);
+ %dat = ();
+ }
+ }
+ process(\%dat, @_);
+}
+
+sub process {
+ my $dat = shift;
+ my $pkgs = shift;
+ my $ifaces = shift;
+ my $path;
+ return undef if $$dat{pkg} eq 'ghc';
+ my $p = $$dat{pkg}.'-'.$$dat{ver};
+ return undef if (exists $$pkgs{$p});
+ if ($$dat{html} =~ m,^/usr/share/doc/([^/]*-doc/html/.*),) {
+ $path = "../../$1";
+ } elsif ($$dat{html} =~ m,^/usr/share/doc/ghc6-doc/libraries/(.*),) {
+ $path = $1;
+ }
+ if (defined $path && -r $$dat{ifaces}) {
+ $$pkgs{$p} = 1;
+ push @ifaces, "--read-interface=$path,$$dat{ifaces}";
+ }
+}
diff -rN -u old-ghc/ghc6.dirs new-ghc/ghc6.dirs
--- old-ghc/ghc6.dirs 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6.dirs 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1 @@
+/var/lib/ghc-6.10.3/package.conf.d
diff -rN -u old-ghc/ghc6-doc.postinst.in new-ghc/ghc6-doc.postinst.in
--- old-ghc/ghc6-doc.postinst.in 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/ghc6-doc.postinst.in 2011-01-15 06:06:22.969146343 +0000
@@ -3,8 +3,6 @@
#
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>
@@ -22,36 +20,9 @@
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
-gen_contents_index () {
- NAMES=
- HADDOCK_ARGS=`cat /usr/lib/ghc- at VERSION@/package.conf | perl -ne '
-$pkg = $1 if /PackageName "(.*?)"/;
-next if $pkg eq "ghc";
-$pkg =~ y/A-Z/a-z/;
-$skip = 0; foreach my $name (@names) {if ($name eq $pkg) {$skip=1; last;}}
-push @names, $pkg;
-next if $skip;
-next unless /haddockInterfaces = \["(.*?)"/;
-$iface = $1;
-next unless -r $iface;
-next unless /haddockHTMLs = \["(.*?)"/;
-$html = $1;
-undef $hpath;
-if ($html =~ m,^/usr/share/doc/([^/]*-doc/html/.*),) {$hpath = "../../$1";}
-elsif ($html =~ m,^/usr/share/doc/ghc6-doc/libraries/(.*),) {$hpath = $1;}
-else {next;}
-print "--read-interface=$hpath,$iface\n";
-'`
- haddock --gen-index --gen-contents \
- -o /usr/share/doc/ghc6-doc/libraries/ \
- -t "Haskell Hierarchical Libraries" \
- -p /usr/share/doc/ghc6-doc/libraries/prologue.txt \
- $HADDOCK_ARGS
-}
-
case "$1" in
triggered|configure)
- gen_contents_index
+ /usr/lib/ghc6-doc/gen_contents_index
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
diff -rN -u old-ghc/ghc6-doc.postrm.in new-ghc/ghc6-doc.postrm.in
--- old-ghc/ghc6-doc.postrm.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.postrm.in 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ remove)
+ rm -f /usr/share/doc/ghc6-doc/libraries/index.html \
+ /usr/share/doc/ghc6-doc/index-frames.html \
+ /usr/share/doc/ghc6-doc/doc-index.html
+ ;;
+ *)
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -rN -u old-ghc/ghc6-doc.preinst.in new-ghc/ghc6-doc.preinst.in
--- old-ghc/ghc6-doc.preinst.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.preinst.in 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ upgrade|install)
+ if [ -e /usr/share/doc/ghc6-doc/html/libraries/ ] ; then
+ rm -f /usr/share/doc/ghc6-doc/html/libraries/index.html \
+ /usr/share/doc/ghc6-doc/html/libraries/index-frames.html \
+ /usr/share/doc/ghc6-doc/html/libraries/doc-index.html
+ rmdir --ignore-fail-on-non-empty /usr/share/doc/ghc6-doc/html/libraries/
+ rmdir --ignore-fail-on-non-empty /usr/share/doc/ghc6-doc/html/
+ fi
+ ;;
+ *)
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -rN -u old-ghc/ghc6-doc.triggers new-ghc/ghc6-doc.triggers
--- old-ghc/ghc6-doc.triggers 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/ghc6-doc.triggers 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-interest /usr/share/doc/ghc6-doc/libraries
-interest /usr/share/ghc6-doc/haddock
-interest /usr/share/ghc6-doc/ghc-6.10.1/haddock
-interest /usr/lib/ghc6-doc/haddock
-interest /usr/lib/ghc-6.10.1/haddock
-interest /usr/lib/ghc6-6.10.1/haddock
diff -rN -u old-ghc/ghc6-doc.triggers.in new-ghc/ghc6-doc.triggers.in
--- old-ghc/ghc6-doc.triggers.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.triggers.in 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1,6 @@
+interest /usr/share/doc/ghc6-doc/libraries
+interest /usr/share/ghc6-doc/haddock
+interest /usr/share/ghc6-doc/ghc- at VERSION@/haddock
+interest /usr/share/ghc6-doc/ghc- at VERSION@/desc
+interest /usr/lib/ghc6-doc/haddock
+interest /usr/lib/ghc- at VERSION@/haddock
diff -rN -u old-ghc/ghc6.links new-ghc/ghc6.links
--- old-ghc/ghc6.links 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6.links 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1,2 @@
+/var/lib/ghc-6.10.3/package.conf /usr/lib/ghc-6.10.3/package.conf
+/var/lib/ghc-6.10.3/package.conf.d /usr/lib/ghc-6.10.3/package.conf.d
diff -rN -u old-ghc/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in 2011-01-15 06:06:22.705132435 +0000
+++ new-ghc/ghc6.postinst.in 2011-01-15 06:06:22.969146343 +0000
@@ -8,6 +8,7 @@
libdir=/usr/lib/ghc- at VERSION@
bindir=$libdir/bin
mandir=/usr/share/man
+vardir=/var/lib/ghc- at VERSION@
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
@@ -26,29 +27,37 @@
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
+if $libdir/bin/ghc --info | grep -q '"Have interpreter","YES"' ; then
+ NEED_INTERPRETER="\
+ --slave $execdir/runghc runghc $bindir/runghc \
+ --slave $execdir/ghci ghci $bindir/ghci \
+ --slave $mandir/man1/ghci.1.gz ghci.1.gz $mandir/man1/ghc6.1.gz \
+ --slave $mandir/man1/runghc.1.gz runghc.1.gz $mandir/man1/runghc6.1.gz"
+fi
+
case "$1" in
configure|abort-upgrade|abort-remove|abort-deconfigure)
- update-alternatives \
- --install $execdir/runhaskell runhaskell $execdir/runghc6 8600000600
+ if [ -n "$NEED_INTERPRETER" ] ; then
+ update-alternatives \
+ --install $execdir/runhaskell runhaskell $execdir/runghc6 8600000600 \
+ --slave $mandir/man1/runhaskell.1.gz runhaskell.1.gz $mandir/man1/runghc6.1.gz
+ fi
update-alternatives \
--install $execdir/haskell-compiler haskell-compiler $execdir/ghc6 600 \
--slave $mandir/man1/haskell-compiler.1.gz haskell-compiler.1.gz $mandir/man1/ghc6.1.gz
update-alternatives \
--install $execdir/ghc ghc $bindir/ghc 600 \
--slave $execdir/ghc-pkg ghc-pkg $bindir/ghc-pkg \
- --slave $execdir/runghc runghc $bindir/runghc \
- --slave $execdir/ghcprof ghcprof $bindir/ghcprof \
- --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/hasktags hasktags $bindir/hasktags
- if [ ! -e $libdir/package.conf ]
+ --slave $mandir/man1/ghc-pkg.1.gz ghc-pkg.1.gz $mandir/man1/ghc-pkg6.1.gz \
+ --slave $execdir/hasktags hasktags $bindir/hasktags $NEED_INTERPRETER
+ if [ ! -e $vardir/package.conf ]
then
- cp $libdir/package.conf.shipped $libdir/package.conf
+ cp $libdir/package.conf.shipped $vardir/package.conf
fi
;;
*)
diff -rN -u old-ghc/ghc6.postrm.in new-ghc/ghc6.postrm.in
--- old-ghc/ghc6.postrm.in 2011-01-15 06:06:22.701132224 +0000
+++ new-ghc/ghc6.postrm.in 2011-01-15 06:06:22.969146343 +0000
@@ -8,18 +8,17 @@
execdir=/usr/bin
libdir=/usr/lib/ghc- at VERSION@
bindir=$libdir/bin
+vardir=/var/lib/ghc- at VERSION@
case "$1" in
purge)
- rm -f $libdir/package.conf
- rm -f $libdir/package.conf.old
+ rm -f $vardir/package.conf
;;
upgrade)
if dpkg --compare-versions "$2" ge "@VERSION at ++" ||
- dpkg --compare-versions "$2" lt "@VERSION@"
+ dpkg --compare-versions "$2" le "@VERSION@"
then
- rm -f $libdir/package.conf
- rm -f $libdir/package.conf.old
+ rm -f $vardir/package.conf
fi
;;
esac
diff -rN -u old-ghc/ghc6.preinst new-ghc/ghc6.preinst
--- old-ghc/ghc6.preinst 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6.preinst 2011-01-15 06:06:22.969146343 +0000
@@ -0,0 +1,29 @@
+#! /bin/sh
+# preinst script for ghc6
+
+set -e
+
+case "$1" in
+ install)
+ if test -n "$2"; then
+ if dpkg --compare-versions[...incomplete...]
More information about the Pkg-haskell-commits
mailing list