[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-10.dsc

[Kari Pahula]

Tue Feb 17 17:03:49 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-10.dsc

    M ./changelog +19
    M ./control -2 +2
    M ./ghc6-doc.postinst.in -9 +11
    M ./rules -1 +3

Tue Feb 17 17:03:49 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-10.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:11.384536079 +0000
+++ new-ghc/changelog	2011-01-15 06:06:11.644549776 +0000
@@ -1,3 +1,22 @@
+ghc6 (6.10.1+dfsg1-10) unstable; urgency=low
+
+  * chmod +x debian/mk_provided_substvars before calling it.
+
+ -- Kari Pahula <kaol at debian.org>  Tue, 17 Feb 2009 19:03:49 +0200
+
+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.
+
+ -- Kari Pahula <kaol at debian.org>  Tue, 17 Feb 2009 09:52:55 +0200
+
 ghc6 (6.10.1+dfsg1-7) unstable; urgency=low
 
   * Set build deps related to doc building as Build-Depends-Indep.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:11.384536079 +0000
+++ new-ghc/control	2011-01-15 06:06:11.644549776 +0000
@@ -3,8 +3,8 @@
 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
-Build-Depends-Indep: haddock (>= 2.4.1-2), xsltproc, docbook-xsl, docbook-xml
+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-2)
 Homepage: http://haskell.org/
 
 Package: ghc6
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:11.384536079 +0000
+++ new-ghc/ghc6-doc.postinst.in	2011-01-15 06:06:11.644549776 +0000
@@ -30,15 +30,17 @@
 	if [ $PKG != ghc ] && echo $NAMES | grep -vq " $PKG " ; then
 	    NAMES=" $NAMES $PKG "
 	    HADDOCK_FILE=`ghc-pkg field $CABAL haddock-interfaces | cut -d' ' -f 2-`
-	    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"
+	    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
 	    fi
 	fi
     done
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:11.384536079 +0000
+++ new-ghc/rules	2011-01-15 06:06:11.640549566 +0000
@@ -135,7 +135,9 @@
 	# Sort out the package.conf files
 	mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf \
 	   debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped
-	sh -c "debian/mk_provided_substvars $(ProjectVersion)"
+	chmod +x debian/mk_provided_substvars
+	debian/mk_provided_substvars $(ProjectVersion)
+	chmod -x debian/mk_provided_substvars
 
 	# Sort out the binaries
 	mkdir debian/tmp/usr/bin