[Pkg-haskell-commits] darcs: ghc: Remove old hacks

[mail at joachim-breitner.de]

Tue Feb  4 23:26:16 UTC 2014  mail at joachim-breitner.de
  * Remove old hacks

    M ./rules -10 +1

Tue Feb  4 23:26:16 UTC 2014  mail at joachim-breitner.de
  * Remove old hacks
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2014-02-05 10:49:40.413531227 +0000
+++ new-ghc/rules	2014-02-05 10:49:40.425531227 +0000
@@ -197,12 +197,7 @@
 
 	# Add haddock substvars
 	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.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-interface-22" >> debian/ghc-haddock.substvars; \
-	    else \
-	    echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars ;\
-	    fi
+	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars 
 
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/usr/lib/ghc-doc
@@ -216,10 +211,6 @@
 	install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc-doc/index.html
 endif
 
-ifeq (ia64,$(DEB_HOST_ARCH)) # Tested and seen to be necessary with 6.12.1
-	sed -i "s/exec /unset LC_ALL\nexport LC_CTYPE=en_US\nexec /" debian/tmp/usr/lib/ghc/bin/ghc-$(ProjectVersion)
-endif
-
 	# manpages
 	rm -f debian/*.1
 	echo ".so man1/ghc.1" > debian/ghc-$(ProjectVersion).1