[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-2.dsc

[Kari Pahula]

Wed Jan 13 08:02:15 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-2.dsc

    M ./changelog +8
    M ./control -2 +1
    M ./patches/series -1
    M ./rules -18 +6

Wed Jan 13 08:02:15 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-2.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:34.556916970 +0000
+++ new-ghc/changelog	2011-01-15 06:07:34.636921183 +0000
@@ -1,3 +1,11 @@
+ghc6 (6.12.1-2) experimental; urgency=low
+
+  * Added missing build dependency: libncurses5-dev.
+  * Use the included haddock to build documentation and drop the
+    build-depends-indep on haddock.
+
+ -- Kari Pahula <kaol at debian.org>  Wed, 13 Jan 2010 10:02:15 +0200
+
 ghc6 (6.12.1-1) experimental; urgency=low
 
   * New upstream release (Closes: #539789)
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:07:34.556916970 +0000
+++ new-ghc/control	2011-01-15 06:07:34.636921183 +0000
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Kari Pahula <kaol at debian.org>
 Standards-Version: 3.8.3
-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]
-Build-Depends-Indep: haddock (>= 2.6.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
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 06:07:34.556916970 +0000
+++ new-ghc/patches/series	2011-01-15 06:07:34.632920972 +0000
@@ -1,4 +1,3 @@
 system-libffi
 panic-debian-message
 use-debian-gen_contents_index
-system-haddock
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:07:34.556916970 +0000
+++ new-ghc/rules	2011-01-15 06:07:34.628920762 +0000
@@ -24,19 +24,7 @@
 
 GHC=$(firstword $(shell bash -c "type -p ghc6 ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
-
-# This thing violates the principle that builds should work the same
-# way or fail uniformly and not be otherwise affected by what packages
-# are installed.  Optimally, the rules file should have a
-# configure-indep target that would add HADDOCK_DOCS=YES to
-# mk/build.mk.  But as long as we can't use build-arch on buildds,
-# this is IMHO the best option.  I don't want to build GHC as root,
-# via binary-arch, nor make a build target that doesn't actually build
-# docs when B-D-I are present.  A plain Build-Depends on haddock is an
-# option, but as haddock Build-Depends on ghc6, I'd rather break the
-# loop.
-BUILD_HADDOCK_DOCS=$(shell test "$(ProjectVersion)" = "`haddock --ghc-version`" && echo YES || echo NO)
-$(warning BUILD_HADDOCK_DOCS set at build time to $(BUILD_HADDOCK_DOCS))
+BUILD_HADDOCK_DOCS=YES
 
 configure: configure-stamp
 configure-stamp:
@@ -46,7 +34,7 @@
 
 	rm -f mk/build.mk
 	echo "SRC_HC_OPTS += -lffi" >> mk/build.mk
-	echo "HADDOCK_DOCS := $(BUILD_HADDOCK_DOCS)" >> mk/build.mk
+	echo "HADDOCK_DOCS := YES" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
 ifeq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc))
 	echo "GhcUnregisterised=YES" >> mk/build.mk
@@ -149,10 +137,10 @@
 
 	# Sort out the binaries
 	mkdir -p debian/tmp/usr/bin
-	cd debian/tmp/usr/lib/ghc-$(ProjectVersion) && \
-	    if ./ghc --info | grep '"Have interpreter","NO"'; \
-		then rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
-	    fi
+	if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
+	    cd debian/tmp/usr/lib/ghc-$(ProjectVersion) ;rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
+	fi
+	rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock debian/tmp/usr/lib/ghc-$(ProjectVersion)/haddock
 	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
 	    for f in *-$(ProjectVersion); \
 	    do ln -s /usr/lib/ghc-$(ProjectVersion)/bin/$$f \