[Pkg-haskell-commits] darcs: ghc: Remove more stuff about the 6 in some filenames

[Joachim Breitner]

Sat Jan 15 14:25:11 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove more stuff about the 6 in some filenames
  Ignore-this: bd8674b902eb714c184190ab0bffc651

    M ./rules -8 +2

Sat Jan 15 14:25:11 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove more stuff about the 6 in some filenames
  Ignore-this: bd8674b902eb714c184190ab0bffc651
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 14:25:40.371501856 +0000
+++ new-ghc/rules	2011-01-15 14:25:40.387502700 +0000
@@ -172,17 +172,10 @@
 	    cd debian/tmp/usr/lib/ghc-$(ProjectVersion) ;rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
 	fi
 	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
-	    for f in *-$(ProjectVersion); \
-	    do ln -s /usr/lib/ghc-$(ProjectVersion)/bin/$$f \
-	             ../../../bin/; \
-	    done
-	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
 	    for f in *; \
 	    do ln -s /usr/lib/ghc-$(ProjectVersion)/bin/$$f \
-	             ../../../bin/$${f}6; \
+	             ../../../bin/$${f}; \
 	    done
-	rm -f debian/tmp/usr/bin/*-$(ProjectVersion)6
-	rm -f debian/tmp/usr/bin/runhaskell6
 	sed -i 's,topdir="/usr/lib,topdir="/var/lib,' debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/ghc-pkg-$(ProjectVersion)
 	cd debian/haddock-build/haddock; ./Setup copy --dest=../../tmp
 
@@ -205,6 +198,7 @@
 endif
 
 	# manpages
+	rm -f debian/*.1
 	echo ".so man1/ghc.1" > debian/ghc-$(ProjectVersion).1
 	if test -e debian/tmp/usr/bin/ghci-$(ProjectVersion); then \
 	    echo ".so man1/ghc.1" > debian/ghci.1 ;\