[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-8.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:06:07 UTC 2011
Tue Feb 17 07:52:55 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-8.dsc
M ./changelog -7
M ./ghc6-doc.postinst.in -11 +9
Tue Feb 17 07:52:55 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-8.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:06:07.604336942 +0000
+++ new-ghc/changelog 2011-01-15 06:06:07.864350640 +0000
@@ -1,10 +1,3 @@
-ghc6 (6.10.1+dfsg1-9) unstable; urgency=low
-
- * Made ghc6-doc's postinst only call haddock on haddock files that are
- actually installed.
-
- -- Kari Pahula <kaol at debian.org> Tue, 17 Feb 2009 12:52:37 +0200
-
ghc6 (6.10.1+dfsg1-8) unstable; urgency=low
* Moved xsltproc, docbook-xsl, docbook-xml back as Build-Depends.
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:07.604336942 +0000
+++ new-ghc/ghc6-doc.postinst.in 2011-01-15 06:06:07.860350429 +0000
@@ -30,17 +30,15 @@
if [ $PKG != ghc ] && echo $NAMES | grep -vq " $PKG " ; then
NAMES=" $NAMES $PKG "
HADDOCK_FILE=`ghc-pkg field $CABAL haddock-interfaces | cut -d' ' -f 2-`
- if [ -e $HADDOCK_FILE ] ; then
- HTML=`ghc-pkg field $CABAL haddock-html | cut -d' ' -f 2-`
- HPATH=
- if echo $HTML | egrep -q '^/usr/share/doc/[^/]*-doc/html/' ; then
- HPATH="../../`echo $HTML | cut -d/ -f 5-`" ;
- elif echo $HTML | egrep -q '^/usr/share/doc/ghc6-doc/libraries/' ; then
- HPATH="`echo $HTML | cut -d/ -f 7-`" ;
- fi
- if [ -n "$HPATH" ] ; then
- HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$HPATH,$HADDOCK_FILE"
- fi
+ HTML=`ghc-pkg field $CABAL haddock-html | cut -d' ' -f 2-`
+ HPATH=
+ if echo $HTML | egrep -q '^/usr/share/doc/[^/]*-doc/html/' ; then
+ HPATH="../../`echo $HTML | cut -d/ -f 5-`" ;
+ elif echo $HTML | egrep -q '^/usr/share/doc/ghc6-doc/libraries/' ; then
+ HPATH="`echo $HTML | cut -d/ -f 7-`" ;
+ fi
+ if [ -n "$HPATH" ] ; then
+ HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$HPATH,$HADDOCK_FILE"
fi
fi
done
More information about the Pkg-haskell-commits
mailing list