[Pkg-haskell-commits] darcs: ghc: Found more occurences of ghc-pkg6

[Joachim Breitner]

Sat Jan 15 16:00:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Found more occurences of ghc-pkg6
  Ignore-this: 7ed4060e009576906a9008b01584a0f4

    M ./Dh_Haskell.sh -4 +4

Sat Jan 15 16:00:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Found more occurences of ghc-pkg6
  Ignore-this: 7ed4060e009576906a9008b01584a0f4
diff -rN -u old-ghc/Dh_Haskell.sh new-ghc/Dh_Haskell.sh
--- old-ghc/Dh_Haskell.sh	2011-01-15 16:53:35.499340390 +0000
+++ new-ghc/Dh_Haskell.sh	2011-01-15 16:53:35.511341022 +0000
@@ -27,8 +27,8 @@
     local dirs
     local lib
     dep=`strip_hash $1`
-    dirs=`ghc-pkg6 field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
-    lib=`ghc-pkg6 field $dep hs-libraries | grep -i ^hs-libraries |  sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
+    dirs=`ghc-pkg field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
+    lib=`ghc-pkg field $dep hs-libraries | grep -i ^hs-libraries |  sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
     for dir in $dirs ; do
 	if [ -e "${dir}/lib${lib}.a" ] ; then
 	    package=`dpkg-query -S ${dir}/lib${lib}.a | cut -d':' -f 1` || exit $?
@@ -45,8 +45,8 @@
     local dirs
     local lib
     dep=`strip_hash $1`
-    dirs=`ghc-pkg6 field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
-    lib=`ghc-pkg6 field $dep hs-libraries | grep -i ^hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
+    dirs=`ghc-pkg field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
+    lib=`ghc-pkg field $dep hs-libraries | grep -i ^hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
     for dir in $dirs ; do
 	if [ -e "${dir}/lib${lib}_p.a" ] ; then
 	    package=`dpkg-query -S ${dir}/lib${lib}_p.a | cut -d':' -f 1` || exit $?