[Pkg-haskell-commits] darcs: haskell-devscripts: Depend on ghc >= 7.4, adjusting to its haddock --interface-version behaviour.

[Joachim Breitner]

Sat Feb  4 09:50:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Depend on ghc >= 7.4, adjusting to its haddock --interface-version behaviour. 
  Ignore-this: 5069540fc7043c9deddf2cdfe813b058

    M ./debian/changelog +7
    M ./debian/control -3 +2
    M ./dh_haskell_depends -1 +1

Sat Feb  4 09:50:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Depend on ghc >= 7.4, adjusting to its haddock --interface-version behaviour. 
  Ignore-this: 5069540fc7043c9deddf2cdfe813b058
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2012-02-04 10:06:04.133771038 +0000
+++ new-haskell-devscripts//debian/changelog	2012-02-04 10:06:04.137767007 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.8.12) UNRELEASED; urgency=low
+
+  * Depend on ghc >= 7.4, adjusting to its haddock --interface-version
+    behaviour. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 04 Feb 2012 10:49:16 +0100
+
 haskell-devscripts (0.8.11) unstable; urgency=low
 
   * Conflict with ghc >= 7.4; as haddock --interface-name behaves differently
diff -rN -u old-haskell-devscripts//debian/control new-haskell-devscripts//debian/control
--- old-haskell-devscripts//debian/control	2012-02-04 10:06:04.119248745 +0000
+++ new-haskell-devscripts//debian/control	2012-02-04 10:06:04.137767007 +0000
@@ -14,13 +14,12 @@
 Depends: dctrl-tools
   , debhelper
   , dh-buildinfo
-  , ghc (>= 7.0.4-3)
+  , ghc (>= 7.4)
   , cdbs
   , ${misc:Depends}
   , html-xml-utils
   , hscolour (>= 1.8)
-  , ghc-haddock (>= 7.0.2-5)
-Conflicts: ghc (>= 7.4)
+  , ghc-haddock (>= 7.4)
 Description: Tools to help Debian developers build Haskell packages
  This package provides a collection of scripts to help build Haskell
  packages for Debian.  Unlike haskell-utils, this package is not
diff -rN -u old-haskell-devscripts//dh_haskell_depends new-haskell-devscripts//dh_haskell_depends
--- old-haskell-devscripts//dh_haskell_depends	2012-02-04 10:06:04.115246711 +0000
+++ new-haskell-devscripts//dh_haskell_depends	2012-02-04 10:06:04.141757527 +0000
@@ -124,7 +124,7 @@
                 -e ^haskell:Recommends \
                 -e ^haskell:Suggests \
                 $sfile > $sfile.tmp || true
-	    depends=`haddock --interface-version`
+	    depends=haddock-interface-`haddock --interface-version`
             echo "haskell:Depends=$depends" >> $sfile.tmp
             recommends=` \
                 find debian/$pkg -name \*.html -exec hxwls -r \{\} \; \