[Pkg-haskell-commits] darcs: haskell-devscripts: dh_haskell_depends: Only include packages in substvars if they exist in debian/control.
Marco Túlio Gontijo e Silva
marcot at debian.org
Fri Apr 23 14:37:51 UTC 2010
Thu Apr 22 18:43:23 UTC 2010 Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at debian.org>
* dh_haskell_depends: Only include packages in substvars if they exist in debian/control.
Ignore-this: fadbd1efdbed8df019367338a73896a6
M! ./debian/changelog -7
M! ./dh_haskell_depends -2 +11
Thu Apr 22 18:43:23 UTC 2010 Marco Túlio Gontijo e Silva <marcot at debian.org>
* dh_haskell_depends: Only include packages in substvars if they exist in debian/control.
Ignore-this: fadbd1efdbed8df019367338a73896a6
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog 2010-04-23 14:37:51.404702025 +0000
+++ new-haskell-devscripts/debian/changelog 2010-04-23 14:37:51.416702662 +0000
@@ -1,10 +1,3 @@
-haskell-devscripts (0.7.9) UNRELEASED; urgency=low
-
- * dh_haskell_shlibdeps: Mangle paths in package descriptions more
- selectively
-
- -- Joachim Breitner <nomeata at debian.org> Fri, 16 Apr 2010 21:32:13 +0200
-
haskell-devscripts (0.7.8) unstable; urgency=low
* Parse cabal files more liberaly in hlibrary.mk
diff -rN -u old-haskell-devscripts/dh_haskell_depends new-haskell-devscripts/dh_haskell_depends
--- old-haskell-devscripts/dh_haskell_depends 2010-04-23 14:37:51.404702025 +0000
+++ new-haskell-devscripts/dh_haskell_depends 2010-04-23 14:37:51.404702025 +0000
@@ -82,7 +82,15 @@
echo "haskell:Recommends=" >> $sfile.tmp
doc=`echo $pkg | sed -e 's/-dev$/-doc/'`
prof=`echo $pkg | sed -e 's/-dev$/-prof/'`
- suggests="$doc, $prof"
+ grep $doc debian/control > /dev/null \
+ && suggests="$doc" \
+ || suggests=""
+ if grep $prof debian/control > /dev/null
+ then
+ [ "$suggests" = "" ] \
+ && suggests="$prof" \
+ || suggests="$suggests, $prof"
+ fi
echo "haskell:Suggests=$suggests" >> $sfile.tmp
;;
libghc6-*-prof)
@@ -130,7 +138,8 @@
| sed -e :a -e '$!N; s/\n/, /; ta'`
echo "haskell:Recommends=$recommends" >> $sfile.tmp
dev=`echo $pkg | sed -e 's/^[^-]\+-\(.\+\)-doc/libghc6-\1-dev/'`
- echo "haskell:Suggests=$dev" >> $sfile.tmp
+ grep $dev debian/control && suggests="$dev" || suggests=""
+ echo "haskell:Suggests=$suggests" >> $sfile.tmp
mv $sfile.tmp $sfile
;;
*)
More information about the Pkg-haskell-commits
mailing list