[Pkg-haskell-commits] darcs: haskell-devscripts: dh_haskell_depends: Ignore comments in debian/control.

[Marco Túlio Gontijo e Silva]

Tue Jun  8 22:28:39 UTC 2010  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at marcot.eti.br>
  * dh_haskell_depends: Ignore comments in debian/control.
  Ignore-this: a2107db9eec67539ed14f24d771e9d6

    M ./debian/changelog +1
    M ./dh_haskell_depends -3 +5

Tue Jun  8 22:28:39 UTC 2010  Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>
  * dh_haskell_depends: Ignore comments in debian/control.
  Ignore-this: a2107db9eec67539ed14f24d771e9d6
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2010-06-09 02:42:54.763849449 +0000
+++ new-haskell-devscripts/debian/changelog	2010-06-09 02:42:54.775850080 +0000
@@ -6,6 +6,7 @@
 
   [ Marco Túlio Gontijo e Silva ]
   * Dh_Haskell.sh: ghc_pkg_field.
+  * dh_haskell_depends: Ignore comments in debian/control.
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 23 Apr 2010 11:36:31 -0300
 
diff -rN -u old-haskell-devscripts/dh_haskell_depends new-haskell-devscripts/dh_haskell_depends
--- old-haskell-devscripts/dh_haskell_depends	2010-06-09 02:42:54.763849449 +0000
+++ new-haskell-devscripts/dh_haskell_depends	2010-06-09 02:42:54.767849659 +0000
@@ -82,10 +82,10 @@
                     echo "haskell:Recommends=" >> $sfile.tmp
                     doc=`echo $pkg | sed -e 's/-dev$/-doc/'`
                     prof=`echo $pkg | sed -e 's/-dev$/-prof/'`
-                    grep $doc debian/control > /dev/null \
+                    grep -v '^#' debian/control | grep $doc > /dev/null \
                         && suggests="$doc" \
                         || suggests=""
-                    if grep $prof debian/control > /dev/null
+                    if grep -v '^#' debian/control | grep $prof > /dev/null
                     then
                         [ "$suggests" = "" ] \
                             && suggests="$prof" \
@@ -138,7 +138,9 @@
                 | sed -e :a -e '$!N; s/\n/, /; ta'`
             echo "haskell:Recommends=$recommends" >> $sfile.tmp
             dev=`echo $pkg | sed -e 's/^[^-]\+-\(.\+\)-doc/libghc6-\1-dev/'`
-            grep $dev debian/control && suggests="$dev" || suggests=""
+            grep -v '^#' debian/control | grep $dev > /dev/null \
+                && suggests="$dev" \
+                || suggests=""
             echo "haskell:Suggests=$suggests" >> $sfile.tmp
             mv $sfile.tmp $sfile
             ;;