[Pkg-haskell-commits] r852 - in /packages/haskell-devscripts/trunk: debian/control dh_haskell_prep postinst-ghc prerm-ghc

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Dec 30 18:11:13 2007
New Revision: 852

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=852
Log:
[project @ reorganize prerm and postinst scripts]

Original author: Arjan Oosting <arjanoosting at home.nl>
Date: 2007-07-25 21:15:25+00:00

Modified:
    packages/haskell-devscripts/trunk/debian/control
    packages/haskell-devscripts/trunk/dh_haskell_prep
    packages/haskell-devscripts/trunk/postinst-ghc
    packages/haskell-devscripts/trunk/prerm-ghc

Modified: packages/haskell-devscripts/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/control?rev=852&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/control (original)
+++ packages/haskell-devscripts/trunk/debian/control Sun Dec 30 18:11:13 2007
@@ -9,7 +9,7 @@
 
 Package: haskell-devscripts
 Architecture: all
-Depends: debhelper, libghc6-cabal-dev (>= 0.4) | ghc6 (>= 6.4), ghc6 (>= 6.2)
+Depends: debhelper, ghc6 (>= 6.4)
 Description: Tools to help Debian developers build Haskell packages
  This package provides a collection of scripts to help build Haskell
  packages for Debian.  Unlike haskell-utils, this package is not

Modified: packages/haskell-devscripts/trunk/dh_haskell_prep
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_prep?rev=852&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_prep (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_prep Sun Dec 30 18:11:13 2007
@@ -132,7 +132,7 @@
 
                 print "$ghcver $pkglibdir $cabalname $cabalversion\n";
                 autoscript($package,"postinst","postinst-ghc",
-                           "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%");
+                           "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
                 autoscript($package,"prerm","prerm-ghc",
                            "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
             }

Modified: packages/haskell-devscripts/trunk/postinst-ghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/postinst-ghc?rev=852&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/postinst-ghc (original)
+++ packages/haskell-devscripts/trunk/postinst-ghc Sun Dec 30 18:11:13 2007
@@ -1,22 +1,21 @@
 GHC=#GHCVER#
+GHC_PKG=/usr/lib/$GHC/bin/ghc-pkg 
 CONFIGFILE=#PKGLIBDIR#/installed-pkg-config
 
 
 case "$1" in
-    configure)
-    /usr/lib/$GHC/bin/ghc-pkg -g --add-package \
-      < $CONFIGFILE
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
+    abort-deconfigure|abort-remove|abort-upgrade|configure)
+	OLDVERSION=`$GHC_PKG --global field #CABALNAME# version | sed "s/version: //"` \
+	    2> /dev/null || true
+	if [ -n "$OLDVERSION" ] ; then
+	    $GHC_PKG --global hide #CABALNAME#-$OLDVERSION
+	fi
+	$GHC_PKG --global --auto-ghci-libs register $CONFIGFILE
+	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 1
-    ;;
+	;;
 esac
 
 

Modified: packages/haskell-devscripts/trunk/prerm-ghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/prerm-ghc?rev=852&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/prerm-ghc (original)
+++ packages/haskell-devscripts/trunk/prerm-ghc Sun Dec 30 18:11:13 2007
@@ -1,22 +1,29 @@
-
 GHC=#GHCVER#
+GHC_PKG=/usr/lib/$GHC/bin/ghc-pkg 
 CONFIGFILE=#PKGLIBDIR#/installed-pkg-config
-CABALNAME=#CABALNAME#
-
 
 
 case "$1" in
-    remove|upgrade|deconfigure)
-      /usr/lib/$GHC/bin/ghc-pkg -r $CABALNAME-#CABALVERSION#
-      rm -vf #PKGLIBDIR#/HS#CABALNAME#-#CABALVERSION#.o
-
+    deconfigure|remove)
+	$GHC_PKG unregister #CABALNAME#-#CABALVERSION#
+	rm -vf #PKGLIBDIR#/HS#CABALNAME#-#CABALVERSION#.o
+	OLDPACKAGE=`$GHC_PKG --global latest #CABALNAME#` \
+	    2> /dev/null || true
+	if [ -n "$OLDPACKAGE" ] ; then
+	    $GHC_PKG expose $OLDPACKAGE || true
+	fi
+	
         ;;
+    upgrade)
+	$GHC_PKG unregister #CABALNAME#-#CABALVERSION#
+	rm -vf #PKGLIBDIR#/HS#CABALNAME#-#CABALVERSION#.o
+	;;
     failed-upgrade)
         ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2
         exit 1
-    ;;
+	;;
 esac