Bug#512063: Patch for haskell-devscripts vs. new ghc6 brokeness

[Arjan Oosting]

Hi,

Op zaterdag 17-01-2009 om 14:13 uur [tijdzone +0100], schreef Arjan Oosting:
> Hi,
> 
> I will look at this today and upload a fix.

I will upload a new version to unstable with the following changes:

+haskell-devscripts (0.6.15~pre1) 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 <ar...@debian.org>  Sat, 17 Jan 2009 14:20:00 +0100


=== debian/changelog
==================================================================
--- debian/changelog	(revision 256)
+++ debian/changelog	(local)
@@ -1,3 +1,11 @@
+haskell-devscripts (0.6.15~pre1) 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 <ar...@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. 
=== dh_haskell_prep
==================================================================
--- dh_haskell_prep	(revision 256)
+++ dh_haskell_prep	(local)
@@ -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%");
 	    }
 	}
 
=== postinst-ghc
==================================================================
--- postinst-ghc	(revision 256)
+++ postinst-ghc	(local)
@@ -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
 
 
=== prerm-ghc
==================================================================
--- prerm-ghc	(revision 256)
+++ prerm-ghc	(local)
@@ -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
 
 

signature.asc
Description: Dit berichtdeel is digitaal ondertekend