[Pkg-haskell-commits] darcs: haskell-devscripts: Dh_Haskell.sh: ghc_pkg_field.
Marco Túlio Gontijo e Silva
marcot at debian.org
Fri May 21 22:14:11 UTC 2010
Fri May 21 20:00:16 UTC 2010 Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at debian.org>
* Dh_Haskell.sh: ghc_pkg_field.
Ignore-this: 893b8cd6f271e6f954a72292ff7daae6
M ./Dh_Haskell.sh -4 +8
M ./debian/changelog +4
Fri May 21 20:00:16 UTC 2010 Marco Túlio Gontijo e Silva <marcot at debian.org>
* Dh_Haskell.sh: ghc_pkg_field.
Ignore-this: 893b8cd6f271e6f954a72292ff7daae6
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog 2010-05-21 22:14:10.830068547 +0000
+++ new-haskell-devscripts/debian/changelog 2010-05-21 22:14:10.842069181 +0000
@@ -1,8 +1,12 @@
haskell-devscripts (0.7.10) UNRELEASED; urgency=low
+ [ Joachim Breitner ]
* dh_haskell_shlibdeps: Mangle paths in package descriptions more
selectively
+ [ Marco Túlio Gontijo e Silva ]
+ * Dh_Haskell.sh: ghc_pkg_field.
+
-- Joachim Breitner <nomeata at debian.org> Fri, 23 Apr 2010 11:36:31 -0300
haskell-devscripts (0.7.9) unstable; urgency=low
diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
--- old-haskell-devscripts/Dh_Haskell.sh 2010-05-21 22:14:10.830068547 +0000
+++ new-haskell-devscripts/Dh_Haskell.sh 2010-05-21 22:14:10.834068758 +0000
@@ -20,6 +20,10 @@
echo "$package (>= $version), $package (<< $next_upstream_version)"
}
+ghc_pkg_field(){
+ ghc-pkg6 --global field $@ | head -n1
+}
+
providing_package_for_ghc6(){
local package
local dep
@@ -27,8 +31,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 +49,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 $?
More information about the Pkg-haskell-commits
mailing list