Hiya, On Sun, Aug 15, 2010 at 11:28:37AM +0100, Iain Lane wrote:
Hi [kaol],I think it'd be good to have a ghc6 upload to sid → squeeze with the packaging fixes (not the NEW packages) that went into experimental recently. The most important one in my mind is the --global to ghc-pkg calls. I've seen some upgrade failures due to this, which is really not very nice to experience. Is a further -14 upload, and consequent freeze exception planned?
Well, I got no replies to this so went ahead and uploaded a patched version to Ubuntu Maverick with the bugfixes backported from experimental. I've attached the patch in case it's wanted in Squeeze. Thanks, Iain
diff -Nru ghc6-6.12.1/debian/changelog ghc6-6.12.1/debian/changelog --- ghc6-6.12.1/debian/changelog 2010-04-17 08:35:25.000000000 +0100 +++ ghc6-6.12.1/debian/changelog 2010-08-25 14:09:22.000000000 +0100 @@ -1,3 +1,23 @@ +ghc6 (6.12.1-13ubuntu1) maverick; urgency=low + + * Backport some fixes from Debian experimental to fix issues in the + Ubuntu package without having to upgrade to a new release. The + following changelog entries are copied from the Debian + changelog. Thanks to Kari Pahula (kaol) for implementing the + fixes. As soon as 6.12.3 is in unstable, ghc6 can be synced again. + * Only insert packages in gen_contents_index which are both registered + and for which the html directory exists. + * Use ghc-pkg --global in ghc6's trigger to avoid accessing HOME. + (Closes: #578679) (LP: #596784) + * Fix directories in haddock manpage. (Closes: #578321) + * Downgrade ghc6's dependency on perl to Suggests and have ghc6-doc + depend on perl. (Closes: #553332) + * Standards-Version 3.9.0 (no changes necessary) + * ghc6 package now provides ghc6-ghci on architectures where it's + supported (i386 and amd64 only currently). + + -- Iain Lane <[email protected]> Wed, 25 Aug 2010 14:03:34 +0100 + ghc6 (6.12.1-13) unstable; urgency=low * Remove debian/watcher.sh. (Closes: #571824) diff -Nru ghc6-6.12.1/debian/control ghc6-6.12.1/debian/control --- ghc6-6.12.1/debian/control 2010-02-19 17:35:26.000000000 +0000 +++ ghc6-6.12.1/debian/control 2010-08-25 16:07:11.000000000 +0100 @@ -1,19 +1,19 @@ Source: ghc6 Section: haskell Priority: optional -Maintainer: Kari Pahula <[email protected]> -Standards-Version: 3.8.4 +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Kari Pahula <[email protected]> +Standards-Version: 3.9.0 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, libc6-dev, ${shlibs:Depends}, ${misc:Depends} -Provides: haskell-compiler, ghc, haddock, ${provided-devs}, ${haskell:Provides} -Conflicts: ghc4 (<= 4.08.1-4), haddock +Depends: gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends} +Provides: haskell-compiler, ghc, haddock, ${provided-devs}, ${haskell:Provides}, ${ghci} Replaces: haddock, ghc6-doc (= 6.12.1-8) Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.6.19), ghc6-doc (<= 6.12.1-8) -Suggests: ghc6-prof, ghc6-doc, haskell-doc +Suggests: perl, 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 a compiler for Haskell98. diff -Nru ghc6-6.12.1/debian/ghc6.postinst.in ghc6-6.12.1/debian/ghc6.postinst.in --- ghc6-6.12.1/debian/ghc6.postinst.in 2010-04-17 08:36:14.000000000 +0100 +++ ghc6-6.12.1/debian/ghc6.postinst.in 2010-08-25 13:38:53.000000000 +0100 @@ -37,7 +37,7 @@ case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) - $bindir/ghc-pkg recache + $bindir/ghc-pkg recache --global if [ -n "$NEED_INTERPRETER" ] ; then update-alternatives \ --install $execdir/runhaskell runhaskell $execdir/runghc6 8600000600 \ @@ -56,12 +56,12 @@ --slave $mandir/man1/ghc.1.gz ghc.1.gz $mandir/man1/ghc6.1.gz \ --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 - $bindir/ghc-pkg recache - $bindir/ghc-pkg check || true + $bindir/ghc-pkg recache --global + $bindir/ghc-pkg check --global || true ;; triggered) - $bindir/ghc-pkg recache - $bindir/ghc-pkg check || true + $bindir/ghc-pkg recache --global + $bindir/ghc-pkg check --global || true ;; *) echo "postinst called with unknown argument \`$1'" >&2 diff -Nru ghc6-6.12.1/debian/haddock.man ghc6-6.12.1/debian/haddock.man --- ghc6-6.12.1/debian/haddock.man 2010-02-05 18:09:20.000000000 +0000 +++ ghc6-6.12.1/debian/haddock.man 2010-08-25 13:43:34.000000000 +0100 @@ -1,4 +1,4 @@ -.TH HADDOCK 1 "September 2006" "Haddock, version 0.8" "Haddock documentation generator" +.TH HADDOCK 1 "July 2010" "Haddock, version 2.6.0" "Haddock documentation generator" .SH NAME @@ -195,17 +195,17 @@ .SH FILES .I /usr/bin/haddock .br -.I /usr/share/haddock-0.8/html/plus.gif +.I /usr/share/haddock-2.6.0/html/plus.gif .br -.I /usr/share/haddock-0.8/html/minus.gif +.I /usr/share/haddock-2.6.0/html/minus.gif .br -.I /usr/share/haddock-0.8/html/haskell_icon.gif +.I /usr/share/haddock-2.6.0/html/haskell_icon.gif .br -.I /usr/share/haddock-0.8/html/haddock.js +.I /usr/share/haddock-2.6.0/html/haddock.js .br -.I /usr/share/haddock-0.8/html/haddock.css +.I /usr/share/haddock-2.6.0/html/haddock.css .br -.I /usr/share/haddock-0.8/html/haddock-DEBUG.css +.I /usr/share/haddock-2.6.0/html/haddock-DEBUG.css .SH SEE ALSO .IR /usr/share/doc/haddock/ , @@ -216,9 +216,9 @@ .UE .SH COPYRIGHT -Haddock version 0.8 +Haddock version 2.6.0 -Copyright 2006 Simon Marlow <[email protected]>. +Copyright 2006-2010 Simon Marlow <[email protected]>, Dawid Waern <[email protected]>. All rights reserved. diff -Nru ghc6-6.12.1/debian/rules ghc6-6.12.1/debian/rules --- ghc6-6.12.1/debian/rules 2010-04-17 08:34:12.000000000 +0100 +++ ghc6-6.12.1/debian/rules 2010-08-25 13:43:34.000000000 +0100 @@ -146,14 +146,15 @@ echo "ghc6-prof binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/Cabal-*/Distribution/License.p_hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6-prof # Sort out the package.conf files - ln -s debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf \ - debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf mkdir -p debian/tmp/var/lib/ghc-$(ProjectVersion) mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf.d \ debian/tmp/var/lib/ghc-$(ProjectVersion)/ rm debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/package.cache chmod +x debian/provided_substvars debian/provided_substvars +ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64)) + echo 'ghci=ghc6-ghci' >> debian/ghc6.substvars +endif sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-$(ProjectVersion)/haddock/,' debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/*.conf # Sort out the binaries
signature.asc
Description: Digital signature
