[Pkg-haskell-commits] r1146 - in /packages/haskell-devscripts/trunk: debian/changelog dh_haskell_depends

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sat Apr 12 10:08:30 2008
New Revision: 1146

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1146
Log:
 r49 at reddwarf:  arjan | 2008-04-08 07:26:00 +0200
 * dh_haskell_depends:
 - Change the way the next upstream version of a native debian package
 is determined. (Closes: #473549)
 - Fix the generation of the ${haskell:Depends} substvar for profiling
 packages. (Closes: #474921) 

Modified:
    packages/haskell-devscripts/trunk/debian/changelog
    packages/haskell-devscripts/trunk/dh_haskell_depends

Modified: packages/haskell-devscripts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/changelog?rev=1146&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sat Apr 12 10:08:30 2008
@@ -1,3 +1,13 @@
+haskell-devscripts (0.6.11~pre1) unstable; urgency=low 
+  
+  * dh_haskell_depends:
+    - Change the way the next upstream version of a native debian package
+      is determined. (Closes: #473549)
+    - Fix the generation of the ${haskell:Depends} substvar for profiling
+      packages. (Closes: #474921) 
+
+ -- Arjan Oosting <arjan at debian.org>  Tue, 08 Apr 2008 06:49:14 +0200
+
 haskell-devscripts (0.6.10) unstable; urgency=low
 
   * dh_install:

Modified: packages/haskell-devscripts/trunk/dh_haskell_depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_depends?rev=1146&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_depends (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_depends Sat Apr 12 10:08:30 2008
@@ -68,7 +68,7 @@
     local next_upstream_version
     package=$1
     version=`dpkg-query --showformat='${Version}' -W $package` 
-    next_upstream_version=`echo $version | sed -e 's/-[^-]*$/+/'`
+    next_upstream_version=`echo $version | sed  -e 's/-[^-]*$//' -e 's/$/+/'`
     echo "$package (>= $version), $package (<< $next_upstream_version)"
 }
 
@@ -94,8 +94,8 @@
     dirs=`ghc-pkg6 field $dep library-dirs | cut -d':' -f 2`
     lib=`ghc-pkg6 field $dep 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 $?
+	if [ -e "${dir}/lib${lib}.a" ] ; then
+	    package=`dpkg-query -S ${dir}/lib${lib}.a | cut -d':' -f 1` || exit $?
 	    continue
 	fi
     done
@@ -112,8 +112,8 @@
     dirs=`ghc-pkg6 field $dep library-dirs | cut -d':' -f 2`
     lib=`ghc-pkg6 field $dep 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.a | cut -d':' -f 1` || exit $?
+	if [ -e "${dir}/lib${lib}_p.a" ] ; then
+	    package=`dpkg-query -S ${dir}/lib${lib}_p.a | cut -d':' -f 1` || exit $?
 	    continue
 	fi
     done
@@ -177,7 +177,7 @@
     pkg=$1
     case "$pkg" in
 	libghc6-*-prof)
-	    pkg=`echo $pkg | sed -e 's/-prof$/-dev$/'`
+	    pkg=`echo $pkg | sed -e 's/-prof$/-dev/'`
 	    ;;
 	*)
 	    ;;
@@ -235,19 +235,19 @@
 	libghc6-*-dev|libghc6-*-prof)
 	    config=`find_config_for_ghc6 $pkg`
 	    if [ -f "$config" ] ; then
-		files="$files $config"
+		cfiles="$files $config"
 	    fi
-	    if [ -z "$files" ] ; then
+	    if [ -z "$cfiles" ] ; then
 	      echo "No installed package description files can not be found" >&2
 	      exit 1
 	    fi
 	    grep -v ^haskell:Depends $sfile > $sfile.tmp || true
 	    case "$pkg" in
 		libghc6-*-dev)
-		    echo "haskell:Depends=`depends_for_ghc6 $files`" >> $sfile.tmp
+		    echo "haskell:Depends=`depends_for_ghc6 $cfiles`" >> $sfile.tmp
 		    ;;
 		libghc6-*-prof)
-		    echo "haskell:Depends=`depends_for_ghc6_prof $files`" >> $sfile.tmp
+		    echo "haskell:Depends=`depends_for_ghc6_prof $cfiles`" >> $sfile.tmp
 		    ;;
 	    esac
 	    mv $sfile.tmp $sfile