[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock haskell-devscripts 0.6.15



Hi,

A lot of Haskell libraries FTBFS after the last upload of GHC6. The upstream version of GHC changed from 6.8.2 to 6.8.2dfsg which broke
haskell-devscripts and as such a lot of Haskell libraries. (See #512063)

I have uploaded a new version of haskell-devscripts (0.6.15) to unstable to fix this bug and I would like to see this version shipped in Lenny.

I just noticed that the version in unstable is newer than the version in testing:

arjan@reddwarf:~/debian/results$ rmadison haskell-devscripts
haskell-devscripts |     0.5.15 |     etch-m68k | source, all
haskell-devscripts |     0.5.15 |        stable | source, all
haskell-devscripts |     0.6.13 |       testing | source, all
haskell-devscripts |     0.6.14 |      unstable | source, all

The changes between 0.6.13 and 0.6.14 are small: Only two bug fixes
and a change to the man page, see change log below and attached diff.

Can you let this version into lenny or do I need to prepare an upload
voor t-p-u? An upload for t-p-u does not really make sense IMO as
Haskell libraries which use haskell-devscripts are build with the version
in unstable anyway.

Greetings Arjan

haskell-devscripts (0.6.15) unstable; urgency=high

  * Set urgengy to high as it fixes a grave bug.
  * Use the --print-libdir instead of the version number of the Debian package
    to determine the GHC library directory  (Closes: #512063) 

 -- Arjan Oosting <arjan@debian.org>  Sat, 17 Jan 2009 14:20:00 +0100

haskell-devscripts (0.6.14) 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@debian.org>  Tue, 26 Aug 2008 17:52:27 +0200

diff -Nru haskell-devscripts-0.6.13/debian/changelog haskell-devscripts-0.6.15/debian/changelog
--- haskell-devscripts-0.6.13/debian/changelog	2008-07-20 01:51:39.000000000 +0200
+++ haskell-devscripts-0.6.15/debian/changelog	2009-01-17 15:22:34.000000000 +0100
@@ -1,3 +1,23 @@
+haskell-devscripts (0.6.15) unstable; urgency=high
+
+  * Set urgengy to high as it fixes a grave bug.
+  * Use the --print-libdir instead of the version number of the Debian package
+    to determine the GHC library directory  (Closes: #512063) 
+
+ -- Arjan Oosting <arjan@debian.org>  Sat, 17 Jan 2009 14:20:00 +0100
+
+haskell-devscripts (0.6.14) 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@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
diff -Nru haskell-devscripts-0.6.13/dh_haskell_build haskell-devscripts-0.6.15/dh_haskell_build
--- haskell-devscripts-0.6.13/dh_haskell_build	2008-03-22 21:28:43.000000000 +0100
+++ haskell-devscripts-0.6.15/dh_haskell_build	2008-10-13 00:26:39.000000000 +0200
@@ -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:
 
diff -Nru haskell-devscripts-0.6.13/dh_haskell_depends haskell-devscripts-0.6.15/dh_haskell_depends
--- haskell-devscripts-0.6.13/dh_haskell_depends	2008-04-08 07:20:58.000000000 +0200
+++ haskell-devscripts-0.6.15/dh_haskell_depends	2008-10-13 00:14:59.000000000 +0200
@@ -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
diff -Nru haskell-devscripts-0.6.13/dh_haskell_prep haskell-devscripts-0.6.15/dh_haskell_prep
--- haskell-devscripts-0.6.13/dh_haskell_prep	2008-03-22 21:28:43.000000000 +0100
+++ haskell-devscripts-0.6.15/dh_haskell_prep	2009-01-17 15:17:50.000000000 +0100
@@ -49,15 +49,18 @@
 	    if ($pkgtype eq "ghc6") {
 		# Build scripts
 		my $ghcver = "ghc-" . upstream_version(version_of_type($pkgtype));
+		my $ghclibdir = `/usr/bin/ghc6 --print-libdir` or die "Could not determine  GHC library directory: $!";
 		my $pkglibdir = getcabalpkglibpath($pkgtype);
 		my $cabalname = getcabalname();
 		my $cabalversion = getcabalversion();
 
+		chomp $ghclibdir;
+
 		print "$ghcver $pkglibdir $cabalname $cabalversion\n";
 		autoscript($package,"postinst","postinst-ghc",
-			   "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
+			   "s%#GHCLIBDIR#%$ghclibdir%;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%");
+			   "s%#GHCLIBDIR#%$ghclibdir%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
 	    }
 	}
 
diff -Nru haskell-devscripts-0.6.13/postinst-ghc haskell-devscripts-0.6.15/postinst-ghc
--- haskell-devscripts-0.6.13/postinst-ghc	2008-03-22 21:28:43.000000000 +0100
+++ haskell-devscripts-0.6.15/postinst-ghc	2009-01-17 14:36:28.000000000 +0100
@@ -1,14 +1,13 @@
-GHC=#GHCVER#
-GHC_PKG=/usr/lib/$GHC/bin/ghc-pkg 
+GHC_PKG=#GHCLIBDIR#/bin/ghc-pkg 
 CONFIGFILE=#PKGLIBDIR#/installed-pkg-config
 
 
 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
 	;;
     *)
diff -Nru haskell-devscripts-0.6.13/prerm-ghc haskell-devscripts-0.6.15/prerm-ghc
--- haskell-devscripts-0.6.13/prerm-ghc	2008-03-22 21:28:43.000000000 +0100
+++ haskell-devscripts-0.6.15/prerm-ghc	2009-01-17 14:37:00.000000000 +0100
@@ -1,5 +1,4 @@
-GHC=#GHCVER#
-GHC_PKG=/usr/lib/$GHC/bin/ghc-pkg 
+GHC_PKG=#GHCLIBDIR#/bin/ghc-pkg 
 CONFIGFILE=#PKGLIBDIR#/installed-pkg-config
 
 

Attachment: signature.asc
Description: Dit berichtdeel is digitaal ondertekend


Reply to: