[Pkg-haskell-commits] darcs: ghc: Call ghc and ghc-pkg via the wrappers in /usr/bin in the postinst script (Closes: 738183)

[Joachim Breitner]

Sat Feb  8 13:09:02 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Call ghc and ghc-pkg via the wrappers in /usr/bin in the postinst script (Closes: 738183)

    M ./changelog +7
    M ./control -1 +1
    M ./ghc-doc.postinst -1 +1
    M ./ghc.postinst -5 +5

Sat Feb  8 13:09:02 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Call ghc and ghc-pkg via the wrappers in /usr/bin in the postinst script (Closes: 738183)
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-02-08 14:01:36.941339444 +0000
+++ new-ghc/changelog	2014-02-08 14:01:36.961339455 +0000
@@ -1,3 +1,10 @@
+ghc (7.8.20140130-2) UNRELEASED; urgency=medium
+
+  * Call ghc and ghc-pkg via the wrappers in /usr/bin in the postinst script
+    (Closes: 738183)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 08 Feb 2014 12:28:14 +0000
+
 ghc (7.8.20140130-1) experimental; urgency=low
 
   [ Gianfranco Costamagna ]
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2014-02-08 14:01:36.941339444 +0000
+++ new-ghc/control	2014-02-08 14:01:36.945339446 +0000
@@ -36,7 +36,7 @@
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic
 Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8)
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), ${provided-devs}
-Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<= 6.12.1-8)
+Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.8)
 Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
diff -rN -u old-ghc/ghc-doc.postinst new-ghc/ghc-doc.postinst
--- old-ghc/ghc-doc.postinst	2014-02-08 14:01:36.941339444 +0000
+++ new-ghc/ghc-doc.postinst	2014-02-08 14:01:36.949339449 +0000
@@ -22,7 +22,7 @@
 
 case "$1" in
     triggered|configure)
-	if test -x /usr/lib/ghc/bin/ghc-pkg; then /usr/lib/ghc/bin/ghc-pkg recache --global; fi
+	if test -x /usr/bin/ghc-pkg; then /usr/bin/ghc-pkg recache --global; fi
         /usr/lib/ghc-doc/gen_contents_index
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)
diff -rN -u old-ghc/ghc.postinst new-ghc/ghc.postinst
--- old-ghc/ghc.postinst	2014-02-08 14:01:36.941339444 +0000
+++ new-ghc/ghc.postinst	2014-02-08 14:01:36.949339449 +0000
@@ -28,7 +28,7 @@
 
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
-	if $libdir/bin/ghc --info | grep '"Have interpreter","YES"' >/dev/null ; then
+	if $execdir/ghc --info | grep '"Have interpreter","YES"' >/dev/null ; then
             update-alternatives \
 		--install $execdir/runhaskell runhaskell $execdir/runghc 600 \
 		--slave $mandir/man1/runhaskell.1.gz runhaskell.1.gz $mandir/man1/runghc.1.gz
@@ -36,12 +36,12 @@
         update-alternatives \
             --install $execdir/haskell-compiler haskell-compiler $execdir/ghc 600 \
             --slave $mandir/man1/haskell-compiler.1.gz haskell-compiler.1.gz $mandir/man1/ghc.1.gz
-	$bindir/ghc-pkg recache --global
-	$bindir/ghc-pkg check --global || true
+	$execdir/ghc-pkg recache --global
+	$execdir/ghc-pkg check --global || true
     ;;
     triggered)
-	$bindir/ghc-pkg recache --global
-	$bindir/ghc-pkg check --global || true
+	$execdir/ghc-pkg recache --global
+	$execdir/ghc-pkg check --global || true
 	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2