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

[Kari Pahula]

Thu May 28 09:40:17 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.3-2.dsc

    M ./changelog -1 +10
    M ./gen_contents_index.in -3 +5
    M ./rules -4 +7

Thu May 28 09:40:17 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.3-2.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:27.333376246 +0000
+++ new-ghc/changelog	2011-01-15 06:06:27.569388679 +0000
@@ -1,3 +1,12 @@
+ghc6 (6.10.3-2) unstable; urgency=low
+
+  * Only call ghc-pkg6 in ghc6-doc's trigger if ghc6 is installed.
+    (Closes: #530732)
+  * Fix the test for seeing if ghci would work.
+  * Build a registerised build on powerpc, but disable ghci.
+
+ -- Kari Pahula <kaol at debian.org>  Thu, 28 May 2009 12:40:17 +0300
+
 ghc6 (6.10.3-1) unstable; urgency=low
 
   * New upstream release
@@ -23,7 +32,7 @@
     (Closes: #514085, #518400)
   * Added man pages for runghc and ghc-pkg. (Closes: #460425, #315763)
   * Removed alternative for /usr/bin/ghcprof. (Closes: #527382)
-  * Build a registerised build on powerpc. (Closes: #514946)
+  * Build an unregisterised build on powerpc. (Closes: #514946)
   * Build-depend on a newer binutils on [arm armel].  Add -mlong-calls to
     gcc's flags.
   * gen_contents_index reintroduced, this time as a perl script.
diff -rN -u old-ghc/gen_contents_index.in new-ghc/gen_contents_index.in
--- old-ghc/gen_contents_index.in	2011-01-15 06:06:27.333376246 +0000
+++ new-ghc/gen_contents_index.in	2011-01-15 06:06:27.565388468 +0000
@@ -8,9 +8,11 @@
 my %pkgs;
 
 # First, add everything from the global Cabal registry to index.
-open CABAL, 'ghc-pkg6 dump --global |' or die "ghc-pkg dump failed: $!";
-addInfo (\*CABAL, \%pkgs, \@ifaces);
-close CABAL;
+if (-e '/usr/bin/ghc-pkg6') {
+    open CABAL, 'ghc-pkg6 dump --global |' or warn "ghc-pkg dump failed: $!";
+    addInfo (\*CABAL, \%pkgs, \@ifaces);
+    close CABAL;
+}
 
 # Then, add -doc packages that aren't registered but have the
 # corresponding data installed otherwise.
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:27.333376246 +0000
+++ new-ghc/rules	2011-01-15 06:06:27.553387836 +0000
@@ -48,11 +48,14 @@
 	echo "XMLDocWays := html" >> mk/build.mk
 	echo "HADDOCK_DOCS := $(BUILD_HADDOCK_DOCS)" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifeq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64))
+ifeq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc))
 	echo "GhcUnregisterised=YES" >> mk/build.mk
 else
 	echo "GhcUnregisterised=NO" >> mk/build.mk
 endif
+ifeq (powerpc,$(DEB_HOST_ARCH))
+	echo "GhcWithInterpreter=NO" >> mk/build.mk
+endif
 ifneq (,$(findstring $(DEB_HOST_ARCH), hppa ia64)) # Doesn't fix the problem :-(
 	echo "GhcWithInterpreter=NO" >> mk/build.mk
 	echo "SplitObjs=NO" >> mk/build.mk
@@ -152,9 +155,9 @@
 
 	# Sort out the binaries
 	mkdir -p debian/tmp/usr/bin
-	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
-	    if ./ghc-$(ProjectVersion) --info | grep -q '"Have interpreter","NO"'; \
-		then rm -f ghci* runghc* runhaskell*; \
+	cd debian/tmp/usr/lib/ghc-$(ProjectVersion) && \
+	    if ./ghc --info | grep '"Have interpreter","NO"'; \
+		then rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
 	    fi
 	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
 	    for f in *-$(ProjectVersion); \