[Pkg-haskell-commits] r1258 - in /packages/haskell-devscripts/trunk: debian/changelog dh_haskell_build dh_haskell_depends postinst-ghc

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Oct 12 22:45:44 2008
New Revision: 1258

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1258
Log:
 r255 at reddwarf:  arjan | 2008-10-13 00:31:26 +0200
 * Handle multiple older versions in postinst-ghc template. 
   (Closes: #496651).
 * Don't forget package description files given on the command line
   when dh_haskell_depends can not find one itself. 
   Thanks Marco Túlio Gontijo e Silva (Closes: #501697)
 * Fix man-page to mention packages which actually use haskell-devscripts 
   (Closes: 497059) 

Modified:
    packages/haskell-devscripts/trunk/debian/changelog
    packages/haskell-devscripts/trunk/dh_haskell_build
    packages/haskell-devscripts/trunk/dh_haskell_depends
    packages/haskell-devscripts/trunk/postinst-ghc

Modified: packages/haskell-devscripts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/changelog?rev=1258&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sun Oct 12 22:45:44 2008
@@ -1,3 +1,15 @@
+haskell-devscripts (0.6.14~pre1) unstable; urgency=low
+
+  * Handle multiple older versions in postinst-ghc template. 
+    (Closes: #496651).
+  * Don't forget package description files given on the command line
+    when dh_haskell_depends can not find one itself. 
+    Thanks Marco Túlio Gontijo e Silva (Closes: #501697)
+  * Fix man-page to mention packages which actually use haskell-devscripts 
+    (Closes: 497059) 
+
+ -- Arjan Oosting <arjan at debian.org>  Tue, 26 Aug 2008 17:52:27 +0200
+
 haskell-devscripts (0.6.13) unstable; urgency=medium
 
   * Apply patch from Chris Lamb to prevent other packages

Modified: packages/haskell-devscripts/trunk/dh_haskell_build
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_build?rev=1258&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_build (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_build Sun Oct 12 22:45:44 2008
@@ -110,7 +110,8 @@
 
 =head1 EXAMPLES
 
-See the Debian source package for hunit.
+See the Debian source packages for haskelldb, haskell-filepath, haskell-hsql, 
+haskell-http etc.
 
 also see:
 

Modified: packages/haskell-devscripts/trunk/dh_haskell_depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_depends?rev=1258&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_depends (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_depends Sun Oct 12 22:45:44 2008
@@ -236,6 +236,8 @@
 	    config=`find_config_for_ghc6 $pkg`
 	    if [ -f "$config" ] ; then
 		cfiles="$files $config"
+	    else
+		cfiles="$files"
 	    fi
 	    if [ -z "$cfiles" ] ; then
 	      echo "No installed package description files can not be found" >&2

Modified: packages/haskell-devscripts/trunk/postinst-ghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/postinst-ghc?rev=1258&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/postinst-ghc (original)
+++ packages/haskell-devscripts/trunk/postinst-ghc Sun Oct 12 22:45:44 2008
@@ -5,10 +5,10 @@
 
 case "$1" in
     abort-deconfigure|abort-remove|abort-upgrade|configure)
-	OLDVERSION=`$GHC_PKG --global field #CABALNAME# version 2> /dev/null | sed "s/version: //"`
-	if [ -n "$OLDVERSION" ] ; then
-	    $GHC_PKG --global hide #CABALNAME#-$OLDVERSION
-	fi
+	OLDVERSIONS=`$GHC_PKG --global field #CABALNAME# version 2> /dev/null | sed "s/version: //"`
+	for VERSION in $OLDVERSIONS ; do
+	    $GHC_PKG --global hide #CABALNAME#-$VERSION || true
+	done
 	$GHC_PKG --global --auto-ghci-libs register $CONFIGFILE
 	;;
     *)