[Pkg-haskell-commits] darcs: ghc: Hardcode in debian/rules that haddock supportin interface version 22 also supports interface version 21.

[Joachim Breitner]

Wed Dec 12 12:55:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Hardcode in debian/rules that haddock supportin interface version 22 also supports interface version 21.
  Ignore-this: 8fb048350b82393025a54c7047503c5

    M ./changelog +2
    M ./rules -1 +6

Wed Dec 12 12:55:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Hardcode in debian/rules that haddock supportin interface version 22 also supports interface version 21.
  Ignore-this: 8fb048350b82393025a54c7047503c5
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-12-12 16:53:39.683749964 +0000
+++ new-ghc//changelog	2012-12-12 16:53:39.718222953 +0000
@@ -4,6 +4,8 @@
     + Closes: #677096 (huge number of wakeups)
   * Remove debian/patches/armhf_llvm_abi, applied upstream, thanks to Shawn
     Landden for noticing (Closes: #695739)
+  * Hardcode in debian/rules that haddock supportin interface version 22 also
+    supports interface version 21.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 10 Dec 2012 19:01:38 +0100
 
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2012-12-12 16:53:39.683749964 +0000
+++ new-ghc//rules	2012-12-12 16:53:39.710222617 +0000
@@ -188,7 +188,12 @@
 
 	# Add haddock substvars
 	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
-	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars
+	# Hardcode that 22 supports 21, until http://trac.haskell.org/haddock/ticket/231 is fixed
+	if [ $$(debian/tmp/usr/bin/haddock --interface-version) -eq 22 ] ; then \
+	    echo "haddock:Provides=haddock-interface-21, haddock-interfaces-22" >> debian/ghc-haddock.substvars; \
+	    else \
+	    echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars ;\
+	    fi
 
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/usr/lib/ghc-doc