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

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sat Jan 17 14:49:13 2009
New Revision: 1277

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1277
Log:
 r277 at reddwarf:  arjan | 2009-01-17 15:22:20 +0100
 * 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) 

Modified:
    packages/haskell-devscripts/trunk/debian/changelog
    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/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/changelog?rev=1277&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sat Jan 17 14:49:13 2009
@@ -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 <arjan at 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. 

Modified: packages/haskell-devscripts/trunk/dh_haskell_prep
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_prep?rev=1277&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_prep (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_prep Sat Jan 17 14:49:13 2009
@@ -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%");
 	    }
 	}
 

Modified: packages/haskell-devscripts/trunk/postinst-ghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/postinst-ghc?rev=1277&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/postinst-ghc (original)
+++ packages/haskell-devscripts/trunk/postinst-ghc Sat Jan 17 14:49:13 2009
@@ -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
 
 

Modified: packages/haskell-devscripts/trunk/prerm-ghc
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/prerm-ghc?rev=1277&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/prerm-ghc (original)
+++ packages/haskell-devscripts/trunk/prerm-ghc Sat Jan 17 14:49:13 2009
@@ -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