[Pkg-haskell-commits] darcs: ghc: No need for alternative handling for /usr/bin/ghc

[Joachim Breitner]

Sat Jan 15 13:00:36 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * No need for alternative handling for /usr/bin/ghc
  Ignore-this: c561bfdc69528c229a3e863fa29a63f6

    M ./ghc.postinst.in -10
    M ./ghc.prerm.in -2

Sat Jan 15 13:00:36 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * No need for alternative handling for /usr/bin/ghc
  Ignore-this: c561bfdc69528c229a3e863fa29a63f6
diff -rN -u old-ghc/ghc.postinst.in new-ghc/ghc.postinst.in
--- old-ghc/ghc.postinst.in	2011-01-15 13:01:15.076443706 +0000
+++ new-ghc/ghc.postinst.in	2011-01-15 13:01:15.100444971 +0000
@@ -46,16 +46,6 @@
         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
-        update-alternatives \
-            --install $execdir/ghc ghc $bindir/ghc 600 \
-            --slave $execdir/ghc-pkg ghc-pkg $bindir/ghc-pkg \
-            --slave $execdir/hsc2hs hsc2hs $bindir/hsc2hs \
-            --slave $execdir/hp2ps hp2ps $bindir/hp2ps \
-            --slave $execdir/hpc hpc $bindir/hpc \
-            --slave $mandir/man1/hp2ps.1.gz hp2ps.1.gz $mandir/man1/hp2ps-ghc.1.gz \
-            --slave $mandir/man1/ghc.1.gz ghc.1.gz $mandir/man1/ghc.1.gz \
-	    --slave $mandir/man1/ghc-pkg.1.gz ghc-pkg.1.gz $mandir/man1/ghc-pkg6.1.gz \
-            --slave $execdir/hasktags hasktags $bindir/hasktags $NEED_INTERPRETER
 	$bindir/ghc-pkg recache --global
 	$bindir/ghc-pkg check --global || true
     ;;
diff -rN -u old-ghc/ghc.prerm.in new-ghc/ghc.prerm.in
--- old-ghc/ghc.prerm.in	2011-01-15 13:01:15.076443706 +0000
+++ new-ghc/ghc.prerm.in	2011-01-15 13:01:15.080443917 +0000
@@ -24,13 +24,11 @@
     remove)
         update-alternatives --remove runhaskell $execdir/runghc
         update-alternatives --remove haskell-compiler $execdir/ghc
-        update-alternatives --remove ghc $bindir/ghc
 	rm -f $vardir/package.conf.d/package.cache
     ;;
     upgrade|deconfigure|failed-upgrade)
         update-alternatives --remove runhaskell $execdir/runghc
         update-alternatives --remove haskell-compiler $execdir/ghc
-        update-alternatives --remove ghc $bindir/ghc
     ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2