[Pkg-haskell-commits] darcs: ghc: Make Provides: ghc-ghci dependent on existence of ghci binary (Closes: #629038)

[Joachim Breitner]

Fri Jun 17 15:31:08 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Make Provides: ghc-ghci dependent on existence of ghci binary (Closes: #629038)
  Ignore-this: 1d894c60576613a48fbff3afe0b1e55b

    M ./changelog +2
    M ./rules -3 +4

Fri Jun 17 15:31:08 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Make Provides: ghc-ghci dependent on existence of ghci binary (Closes: #629038)
  Ignore-this: 1d894c60576613a48fbff3afe0b1e55b
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-06-17 15:34:31.791773865 +0000
+++ new-ghc//changelog	2011-06-17 15:34:31.795782823 +0000
@@ -6,6 +6,8 @@
   * In ghc-doc.prerm, do a better job of cleaning
     /usr/share/doc/ghc-doc/html/libraries of files generated when creating the
     haddock index.
+  * Make Provides: ghc-ghci dependent on existence of ghci binary
+    (Closes: #629038)
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 10 Apr 2011 00:08:06 +0530
 
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2011-06-17 15:34:31.775778414 +0000
+++ new-ghc//rules	2011-06-17 15:34:31.875773461 +0000
@@ -161,9 +161,6 @@
 	rm debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/package.cache
 	chmod +x debian/provided_substvars
 	debian/provided_substvars
-ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64))
-	echo 'ghci=ghc-ghci' >> debian/ghc.substvars
-endif
 	sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-doc/haddock/,' debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/*.conf
 
 	# Remove haddock as built within the ghc tree
@@ -187,6 +184,10 @@
 
 	ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
 
+	# Check if we have a ghci binary
+	if test -e debian/tmp/usr/bin/ghci-$(ProjectVersion); then \
+	    echo 'ghci=ghc-ghci' >> debian/ghc.substvars ; fi
+
 	# Add haddock substvars
 	echo "haddock:Depends=$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
 	echo "haddock:Provides=$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars