[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-7.dsc

[Kari Pahula]

Tue Feb  9 21:45:14 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-7.dsc

    M ./changelog -6
    M ./rules -3 +3

Tue Feb  9 21:45:14 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-7.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:43.213372856 +0000
+++ new-ghc/changelog	2011-01-15 06:07:43.285376648 +0000
@@ -1,9 +1,3 @@
-ghc6 (6.12.1-8) unstable; urgency=low
-
-  * Use tabs instead of 8 spaces in debian/rules for ia64 specific flags.
-
- -- Kari Pahula <kaol at debian.org>  Wed, 10 Feb 2010 13:19:32 +0200
-
 ghc6 (6.12.1-7) unstable; urgency=low
 
   * Include patches to haddock to ghc6's own patches and don't apply them
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:07:43.213372856 +0000
+++ new-ghc/rules	2011-01-15 06:07:43.281376438 +0000
@@ -45,9 +45,9 @@
 	echo "GhcWithInterpreter=NO" >> mk/build.mk
 endif
 ifeq (ia64,$(DEB_HOST_ARCH)) # Tested and seen to be necessary with 6.12.1
-	echo "SRC_CC_OPTS += -Wl,--relax" >> mk/build.mk
-	echo "SRC_HC_OPTS += -optl-Wl,--relax -optl-Wl,-G0" >> mk/build.mk
-	echo "SRC_HC_OPTS += -optc-G0" >> mk/build.mk
+        echo "SRC_CC_OPTS += -Wl,--relax" >> mk/build.mk
+        echo "SRC_HC_OPTS += -optl-Wl,--relax -optl-Wl,-G0" >> mk/build.mk
+        echo "SRC_HC_OPTS += -optc-G0" >> mk/build.mk
 endif
 ifneq (,$(findstring $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64))
 	echo "GhcWithInterpreter=YES"