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

Kari Pahula kaol at debian.org
Sat Jan 15 06:06:14 UTC 2011 

Sat Feb 21 12:08:08 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-12.dsc

    M ./changelog +17
    M ./control -1 +1
    M ./ghc6-doc.postinst.in -23 +21
    M ./ghc6-doc.triggers +2
    M ./ghc6.postrm.in -1 +1
    A ./patches/haddock-usr-lib
    M ./patches/series +1
    M ./rules -2 +3

Sat Feb 21 12:08:08 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-12.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/changelog	2011-01-15 06:06:14.216685273 +0000
@@ -1,3 +1,20 @@
+ghc6 (6.10.1+dfsg1-12) unstable; urgency=low
+
+  * Put haddock in Build-Depends on [i386 amd64 sparc powerpc mips mipsel
+    s390 kfreebsd-i386].
+
+ -- Kari Pahula <kaol at debian.org>  Sat, 21 Feb 2009 14:08:08 +0200
+
+ghc6 (6.10.1+dfsg1-11) unstable; urgency=low
+
+  * Put .haddock files in ghc6, not ghc6-doc.
+  * Don't call ghc-pkg in a loop in ghc6-doc's trigger, use perl instead.
+  * Don't remove packages.conf on upgrade from one 6.10.1+dfsg1 version to
+    another.
+  * Generate haddock index in ghc6-doc's postinst configure, too.
+
+ -- Kari Pahula <kaol at debian.org>  Sat, 21 Feb 2009 10:00:19 +0200
+
 ghc6 (6.10.1+dfsg1-10) unstable; urgency=low
 
   * chmod +x debian/mk_provided_substvars before calling it.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/control	2011-01-15 06:06:14.216685273 +0000
@@ -3,7 +3,7 @@
 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: 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, haddock (>= 2.4.1-2) [i386 amd64 sparc powerpc mips mipsel s390 kfreebsd-i386]
 Build-Depends-Indep: haddock (>= 2.4.1-2)
 Homepage: http://haskell.org/
 
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:13.956671576 +0000
+++ new-ghc/ghc6-doc.postinst.in	2011-01-15 06:06:14.208684852 +0000
@@ -24,27 +24,25 @@
 
 gen_contents_index () {
     NAMES=
-    HADDOCK_ARGS=
-    for CABAL in `ghc-pkg list --global --simple-output` ; do
-	PKG=`echo $CABAL | perl -ne 'm((.*)-[^-]*$); print $1;' | tr 'A-Z' 'a-z'`
-	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
-	    fi
-	fi
-    done
-    /usr/bin/haddock --gen-index --gen-contents \
+    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 \
@@ -52,10 +50,10 @@
 }
 
 case "$1" in
-    triggered)
+    triggered|configure)
         gen_contents_index
 	;;
-    configure|abort-upgrade|abort-remove|abort-deconfigure)
+    abort-upgrade|abort-remove|abort-deconfigure)
 	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
diff -rN -u old-ghc/ghc6-doc.triggers new-ghc/ghc6-doc.triggers
--- old-ghc/ghc6-doc.triggers	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/ghc6-doc.triggers	2011-01-15 06:06:14.212685063 +0000
@@ -1,3 +1,5 @@
 interest /usr/share/doc/ghc6-doc/libraries
 interest /usr/share/ghc6-doc/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.postrm.in new-ghc/ghc6.postrm.in
--- old-ghc/ghc6.postrm.in	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/ghc6.postrm.in	2011-01-15 06:06:14.208684852 +0000
@@ -15,7 +15,7 @@
         rm -f $libdir/package.conf.old
     ;;
     upgrade)
-        if dpkg --compare-versions "$2" ge "@VERSION at +" ||
+        if dpkg --compare-versions "$2" ge "@VERSION at ++" ||
            dpkg --compare-versions "$2" lt "@VERSION@"
         then
             rm -f $libdir/package.conf
diff -rN -u old-ghc/patches/haddock-usr-lib new-ghc/patches/haddock-usr-lib
--- old-ghc/patches/haddock-usr-lib	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/haddock-usr-lib	2011-01-15 06:06:14.176683166 +0000
@@ -0,0 +1,13 @@
+Index: ghc6-6.10.1+dfsg1/mk/cabal-flags.mk
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/mk/cabal-flags.mk	2009-02-20 21:10:30.000000000 +0200
++++ ghc6-6.10.1+dfsg1/mk/cabal-flags.mk	2009-02-20 21:10:53.000000000 +0200
+@@ -123,7 +123,7 @@
+ idynlibdir          = $(dynlibdir)
+ idatadir            = $(datadir)
+ idocdir             = $(docdir)/libraries/$$pkg
+-ihaddockdir         = $(htmldir)/libraries/$$pkg
++ihaddockdir         = $(libdir)/haddock/$$pkg
+ ihtmldir            = $(htmldir)/libraries/$$pkg
+ html_installed_root = $(htmldir)/libraries
+ endif
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/patches/series	2011-01-15 06:06:14.212685063 +0000
@@ -3,3 +3,4 @@
 tuple3-trac2750
 use-system-haddock
 ld-relax-ia64-fix
+haddock-usr-lib
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:13.956671576 +0000
+++ new-ghc/rules	2011-01-15 06:06:14.212685063 +0000
@@ -120,8 +120,8 @@
 	dh_installdirs
 
 	# Install the basic stuff
-	$(MAKE) DESTDIR=`pwd`/debian/tmp install
-	$(MAKE) DESTDIR=`pwd`/debian/tmp install-docs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-docs
 
 	# Delete all the library LICENSE files
 	rm debian/tmp/usr/share/doc/ghc6-doc/libraries/*/LICENSE
@@ -177,6 +177,7 @@
 	find debian/tmp/usr/lib $(FILES) $(PROF_FILE) > debian/ghc6-prof.install
 	echo debian/tmp/usr/share/lintian/overrides/ghc6-prof >> debian/ghc6-prof.install
 	# ghc6-doc
+	find debian/tmp/usr/share/doc    $(FILES) -name '*.haddock' -exec rm '{}' ';'
 	find debian/tmp/usr/share/doc    $(FILES)  > debian/ghc6-doc.install
 	find debian/tmp/usr/lib/ghc6-doc $(FILES) >> debian/ghc6-doc.install

More information about the Pkg-haskell-commits mailing list